diff --git a/3party/Alohalytics b/3party/Alohalytics index ca0535a222..ef8e5ad5ba 160000 --- a/3party/Alohalytics +++ b/3party/Alohalytics @@ -1 +1 @@ -Subproject commit ca0535a2221eddad5cd6d16e7373ad76ec4e28a0 +Subproject commit ef8e5ad5ba7854c4bada9815716f7bb0b59240bf diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 55aeaf5d9d..4e7823e61c 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -134,6 +134,20 @@ android:scheme="http"/> + + + + + + + + + + diff --git a/android/gradle.properties b/android/gradle.properties index 1ae416be9f..db9b8d1933 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -4,8 +4,8 @@ propMinSdkVersion=15 propTargetSdkVersion=23 propCompileSdkVersion=23 propBuildToolsVersion=25.0.2 -propVersionCode=724 -propVersionName=7.2.4 +propVersionCode=733 +propVersionName=7.3.3 propDebugNdkFlags=V=1 NDK_DEBUG=1 DEBUG=1 propReleaseNdkFlags=V=1 NDK_DEBUG=0 PRODUCTION=1 org.gradle.daemon=true diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index daac8aa140..b7e3168b9a 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -565,6 +565,18 @@ int Framework::ToDoAfterUpdate() const return (int) m_work.ToDoAfterUpdate(); } +void Framework::LogLocalAdsEvent(local_ads::EventType type, double lat, double lon, uint16_t accuracy) +{ + auto const & info = g_framework->GetPlacePageInfo(); + auto const & featureID = info.GetID(); + auto const & mwmInfo = featureID.m_mwmId.GetInfo(); + if (!mwmInfo) + return; + + local_ads::Event event(type, mwmInfo->GetVersion(), mwmInfo->GetCountryName(), featureID.m_index, + m_work.GetDrawScale(), std::chrono::steady_clock::now(), lat, lon, accuracy); + m_work.GetLocalAdsManager().GetStatistics().RegisterEvent(std::move(event)); +} } // namespace android //============ GLUE CODE for com.mapswithme.maps.Framework class =============// @@ -1279,4 +1291,11 @@ Java_com_mapswithme_maps_Framework_nativeIsRouteFinished(JNIEnv * env, jclass) { return frm()->IsRouteFinished(); } + +JNIEXPORT void JNICALL +Java_com_mapswithme_maps_Framework_nativeLogLocalAdsEvent(JNIEnv * env, jclass, jint type, + jdouble lat, jdouble lon, jint accuracy) +{ + g_framework->LogLocalAdsEvent(static_cast(type), lat, lon, accuracy); +} } // extern "C" diff --git a/android/jni/com/mapswithme/maps/Framework.hpp b/android/jni/com/mapswithme/maps/Framework.hpp index d0d47b9488..781161fe6c 100644 --- a/android/jni/com/mapswithme/maps/Framework.hpp +++ b/android/jni/com/mapswithme/maps/Framework.hpp @@ -12,6 +12,8 @@ #include "drape/pointers.hpp" #include "drape/oglcontextfactory.hpp" +#include "local_ads/event.hpp" + #include "platform/country_defines.hpp" #include "platform/location.hpp" @@ -182,6 +184,8 @@ namespace android static uber::RideRequestLinks GetUberLinks(std::string const & productId, ms::LatLon const & from, ms::LatLon const & to); int ToDoAfterUpdate() const; + + void LogLocalAdsEvent(local_ads::EventType event, double lat, double lon, uint16_t accuracy); }; } diff --git a/android/jni/com/mapswithme/maps/MapManager.cpp b/android/jni/com/mapswithme/maps/MapManager.cpp index 2d2dc59b22..c001e45910 100644 --- a/android/jni/com/mapswithme/maps/MapManager.cpp +++ b/android/jni/com/mapswithme/maps/MapManager.cpp @@ -103,7 +103,7 @@ Java_com_mapswithme_maps_downloader_MapManager_nativeHasSpaceForMigration(JNIEnv JNIEXPORT jboolean JNICALL Java_com_mapswithme_maps_downloader_MapManager_nativeHasSpaceToDownloadAmount(JNIEnv * env, jclass clazz, jlong bytes) { - return IsEnoughSpaceForDownload(bytes); + return IsEnoughSpaceForDownload(bytes, GetStorage().GetMaxMwmSizeBytes()); } // static boolean nativeHasSpaceToDownloadCountry(String root); diff --git a/android/jni/com/mapswithme/maps/SearchEngine.cpp b/android/jni/com/mapswithme/maps/SearchEngine.cpp index 990e07dbad..d3037e2a6a 100644 --- a/android/jni/com/mapswithme/maps/SearchEngine.cpp +++ b/android/jni/com/mapswithme/maps/SearchEngine.cpp @@ -34,7 +34,8 @@ public: { TYPE_AND = 0, TYPE_OR = 1, - TYPE_OP = 2 + TYPE_OP = 2, + TYPE_ONE_OF = 3 }; // *NOTE* keep this in sync with Java counterpart. @@ -82,6 +83,17 @@ public: m_op = env->GetFieldID(opClass, "mOp", "I"); } + { + auto const oneOfClass = env->FindClass("com/mapswithme/maps/search/HotelsFilter$OneOf"); + auto const hotelTypeClass = + env->FindClass("com/mapswithme/maps/search/HotelsFilter$HotelType"); + m_oneOfType = env->GetFieldID(oneOfClass, "mType", + "Lcom/mapswithme/maps/search/HotelsFilter$HotelType;"); + m_oneOfTile = + env->GetFieldID(oneOfClass, "mTile", "Lcom/mapswithme/maps/search/HotelsFilter$OneOf;"); + m_hotelType = env->GetFieldID(hotelTypeClass, "mType", "I"); + } + { auto const ratingFilterClass = env->FindClass("com/mapswithme/maps/search/HotelsFilter$RatingFilter"); @@ -112,6 +124,7 @@ public: case TYPE_AND: return BuildAnd(env, filter); case TYPE_OR: return BuildOr(env, filter); case TYPE_OP: return BuildOp(env, filter); + case TYPE_ONE_OF: return BuildOneOf(env, filter); } LOG(LERROR, ("Unknown type:", type)); @@ -148,6 +161,28 @@ private: return {}; } + Rule BuildOneOf(JNIEnv * env, jobject filter) + { + auto const oneOfType = env->GetObjectField(filter, m_oneOfType); + auto hotelType = static_cast(env->GetIntField(oneOfType, m_hotelType)); + auto const tile = env->GetObjectField(filter, m_oneOfTile); + unsigned value = 1U << hotelType; + return BuildOneOf(env, tile, value); + } + + Rule BuildOneOf(JNIEnv * env, jobject filter, unsigned value) + { + if (filter == nullptr) + return search::hotels_filter::OneOf(value); + + auto const oneOfType = env->GetObjectField(filter, m_oneOfType); + auto hotelType = static_cast(env->GetIntField(oneOfType, m_hotelType)); + auto const tile = env->GetObjectField(filter, m_oneOfTile); + value = value | (1U << hotelType); + + return BuildOneOf(env, tile, value); + } + Rule BuildRatingOp(JNIEnv * env, int op, jobject filter) { using namespace search::hotels_filter; @@ -197,6 +232,10 @@ private: jfieldID m_field; jfieldID m_op; + jfieldID m_oneOfType; + jfieldID m_oneOfTile; + jfieldID m_hotelType; + jfieldID m_rating; jfieldID m_priceRate; @@ -459,4 +498,24 @@ extern "C" g_framework->NativeFramework()->CancelSearch(search::Mode::Viewport); }); } + + JNIEXPORT jobjectArray JNICALL + Java_com_mapswithme_maps_search_SearchEngine_nativeGetHotelTypes(JNIEnv * env, jclass clazz) + { + using Type = ftypes::IsHotelChecker::Type; + static jclass const hotelTypeClass = + jni::GetGlobalClassRef(env, "com/mapswithme/maps/search/HotelsFilter$HotelType"); + static jmethodID const hotelTypeCtorId = + jni::GetConstructorID(env, hotelTypeClass, "(ILjava/lang/String;)V"); + + vector types; + for (size_t i = 0; i < static_cast(Type::Count); i++) + types.push_back(static_cast(i)); + + return jni::ToJavaArray(env, hotelTypeClass, types, [](JNIEnv * env, Type const & item) { + auto const tag = ftypes::IsHotelChecker::GetHotelTypeTag(item); + return env->NewObject(hotelTypeClass, hotelTypeCtorId, static_cast(item), + jni::ToJavaString(env, tag)); + }); + } } // extern "C" diff --git a/android/jni/com/mapswithme/maps/UserMarkHelper.cpp b/android/jni/com/mapswithme/maps/UserMarkHelper.cpp index 4a7e6b3c6c..dfc6303ac1 100644 --- a/android/jni/com/mapswithme/maps/UserMarkHelper.cpp +++ b/android/jni/com/mapswithme/maps/UserMarkHelper.cpp @@ -35,32 +35,36 @@ jobject CreateBanner(JNIEnv * env, std::string const & id, jint type) return env->NewObject(g_bannerClazz, bannerCtorId, jni::ToJavaString(env, id), type); } -jobject CreateMapObject(JNIEnv * env, int mapObjectType, std::string const & title, - std::string const & secondaryTitle, std::string const & subtitle, double lat, - double lon, std::string const & address, Metadata const & metadata, - std::string const & apiId, jobjectArray jbanners, bool isReachableByTaxi, - std::string const & bookingSearchUrl, jobject const & localAdInfo) +jobject CreateMapObject(JNIEnv * env, string const & mwmName, int64_t mwmVersion, + uint32_t featureIndex, int mapObjectType, string const & title, + string const & secondaryTitle, string const & subtitle, double lat, + double lon, string const & address, Metadata const & metadata, + string const & apiId, jobjectArray jbanners, bool isReachableByTaxi, + string const & bookingSearchUrl, jobject const & localAdInfo) { - // public MapObject(@MapObjectType int mapObjectType, String title, String secondaryTitle, + // public MapObject(@NonNull String mwmName, long mwmVersion, int featureIndex, + // @MapObjectType int mapObjectType, String title, String secondaryTitle, // String subtitle, double lat, double lon, String address, String apiId, // @NonNull Banner banner, boolean reachableByTaxi, // @Nullable String bookingSearchUrl, @Nullable LocalAdInfo localAdInfo) static jmethodID const ctorId = jni::GetConstructorID(env, g_mapObjectClazz, - "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;DDLjava/lang/" + "(Ljava/lang/String;JIILjava/lang/String;Ljava/lang/" + "String;Ljava/lang/String;Ljava/lang/String;DDLjava/lang/" "String;[Lcom/mapswithme/maps/ads/Banner;ZLjava/lang/String;" "Lcom/mapswithme/maps/ads/LocalAdInfo;)V"); + jni::TScopedLocalRef jMwmName(env, jni::ToJavaString(env, mwmName)); jni::TScopedLocalRef jTitle(env, jni::ToJavaString(env, title)); jni::TScopedLocalRef jSecondaryTitle(env, jni::ToJavaString(env, secondaryTitle)); jni::TScopedLocalRef jSubtitle(env, jni::ToJavaString(env, subtitle)); jni::TScopedLocalRef jAddress(env, jni::ToJavaString(env, address)); jni::TScopedLocalRef jApiId(env, jni::ToJavaString(env, apiId)); jni::TScopedLocalRef jBookingSearchUrl(env, jni::ToJavaString(env, bookingSearchUrl)); - jobject mapObject = env->NewObject(g_mapObjectClazz, ctorId, mapObjectType, jTitle.get(), - jSecondaryTitle.get(), jSubtitle.get(), jAddress.get(), lat, - lon, jApiId.get(), jbanners, isReachableByTaxi, - jBookingSearchUrl.get(), localAdInfo); + jobject mapObject = env->NewObject( + g_mapObjectClazz, ctorId, jMwmName.get(), (jlong)mwmVersion, (jint)featureIndex, + mapObjectType, jTitle.get(), jSecondaryTitle.get(), jSubtitle.get(), jAddress.get(), lat, lon, + jApiId.get(), jbanners, isReachableByTaxi, jBookingSearchUrl.get(), localAdInfo); InjectMetadata(env, g_mapObjectClazz, mapObject, metadata); return mapObject; @@ -76,11 +80,13 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info) if (info.IsBookmark()) { - // public Bookmark(@IntRange(from = 0) int categoryId, @IntRange(from = 0) int bookmarkId, + // public Bookmark(@NonNull String mwmName, long mwmVersion, int featureIndex, + // @IntRange(from = 0) int categoryId, @IntRange(from = 0) int bookmarkId, // String name, @Nullable String objectTitle, @NonNull Banner banner, boolean reachableByTaxi) static jmethodID const ctorId = jni::GetConstructorID(env, g_bookmarkClazz, - "(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;" + "(Ljava/lang/String;JIIILjava/lang/String;Ljava/" + "lang/String;Ljava/lang/String;" "[Lcom/mapswithme/maps/ads/Banner;ZLjava/lang/String;" "Lcom/mapswithme/maps/ads/LocalAdInfo;)V"); @@ -89,12 +95,14 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info) BookmarkData const & data = static_cast(cat->GetUserMark(bac.m_bookmarkIndex))->GetData(); + jni::TScopedLocalRef jMwmName(env, jni::ToJavaString(env, info.GetID().GetMwmName())); jni::TScopedLocalRef jName(env, jni::ToJavaString(env, data.GetName())); jni::TScopedLocalRef jTitle(env, jni::ToJavaString(env, info.GetTitle())); jni::TScopedLocalRef jSecondaryTitle(env, jni::ToJavaString(env, info.GetSecondaryTitle())); jni::TScopedLocalRef jBookingSearchUrl(env, jni::ToJavaString(env, info.GetBookingSearchUrl())); jobject mapObject = - env->NewObject(g_bookmarkClazz, ctorId, static_cast(info.m_bac.m_categoryIndex), + env->NewObject(g_bookmarkClazz, ctorId, jMwmName.get(), info.GetID().GetMwmVersion(), + info.GetID().m_index, static_cast(info.m_bac.m_categoryIndex), static_cast(info.m_bac.m_bookmarkIndex), jName.get(), jTitle.get(), jSecondaryTitle.get(), jbanners.get(), info.IsReachableByTaxi(), jBookingSearchUrl.get(), localAdInfo.get()); @@ -110,19 +118,22 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info) // TODO(yunikkk): object can be POI + API + search result + bookmark simultaneously. // TODO(yunikkk): Should we pass localized strings here and in other methods as byte arrays? if (info.IsMyPosition()) - return CreateMapObject(env, kMyPosition, info.GetTitle(), info.GetSecondaryTitle(), - info.GetSubtitle(), ll.lat, ll.lon, address.FormatAddress(), {}, "", - jbanners.get(), info.IsReachableByTaxi(), info.GetBookingSearchUrl(), - localAdInfo.get()); + return CreateMapObject(env, info.GetID().GetMwmName(), info.GetID().GetMwmVersion(), + info.GetID().m_index, kMyPosition, info.GetTitle(), + info.GetSecondaryTitle(), info.GetSubtitle(), ll.lat, ll.lon, + address.FormatAddress(), {}, "", jbanners.get(), + info.IsReachableByTaxi(), info.GetBookingSearchUrl(), localAdInfo.get()); if (info.HasApiUrl()) - return CreateMapObject(env, kApiPoint, info.GetTitle(), info.GetSecondaryTitle(), info.GetSubtitle(), - ll.lat, ll.lon, address.FormatAddress(), info.GetMetadata(), - info.GetApiUrl(), jbanners.get(), info.IsReachableByTaxi(), - info.GetBookingSearchUrl(), localAdInfo.get()); + return CreateMapObject( + env, info.GetID().GetMwmName(), info.GetID().GetMwmVersion(), info.GetID().m_index, + kApiPoint, info.GetTitle(), info.GetSecondaryTitle(), info.GetSubtitle(), ll.lat, ll.lon, + address.FormatAddress(), info.GetMetadata(), info.GetApiUrl(), jbanners.get(), + info.IsReachableByTaxi(), info.GetBookingSearchUrl(), localAdInfo.get()); - return CreateMapObject(env, kPoi, info.GetTitle(), info.GetSecondaryTitle(), info.GetSubtitle(), - ll.lat, ll.lon, address.FormatAddress(), + return CreateMapObject(env, info.GetID().GetMwmName(), info.GetID().GetMwmVersion(), + info.GetID().m_index, kPoi, info.GetTitle(), info.GetSecondaryTitle(), + info.GetSubtitle(), ll.lat, ll.lon, address.FormatAddress(), info.IsFeature() ? info.GetMetadata() : Metadata(), "", jbanners.get(), info.IsReachableByTaxi(), info.GetBookingSearchUrl(), localAdInfo.get()); } diff --git a/android/jni/com/mapswithme/maps/editor/Editor.cpp b/android/jni/com/mapswithme/maps/editor/Editor.cpp index e82365fce7..5fd037b5d0 100644 --- a/android/jni/com/mapswithme/maps/editor/Editor.cpp +++ b/android/jni/com/mapswithme/maps/editor/Editor.cpp @@ -298,6 +298,12 @@ Java_com_mapswithme_maps_editor_Editor_nativeIsNameEditable(JNIEnv * env, jclass return g_editableMapObject.IsNameEditable(); } +JNIEXPORT jboolean JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeIsPointType(JNIEnv * env, jclass clazz) +{ + return g_editableMapObject.IsPointType(); +} + JNIEXPORT jboolean JNICALL Java_com_mapswithme_maps_editor_Editor_nativeIsBuilding(JNIEnv * env, jclass clazz) { @@ -438,16 +444,17 @@ Java_com_mapswithme_maps_editor_Editor_nativeCreateMapObject(JNIEnv *, jclass, j JNIEXPORT void JNICALL Java_com_mapswithme_maps_editor_Editor_nativeCreateNote(JNIEnv * env, jclass clazz, jstring text) { - g_framework->NativeFramework()->CreateNote(g_editableMapObject.GetLatLon(), g_editableMapObject.GetID(), - osm::Editor::NoteProblemType::General, jni::ToNativeString(env, text)); + g_framework->NativeFramework()->CreateNote( + g_editableMapObject, osm::Editor::NoteProblemType::General, jni::ToNativeString(env, text)); } // static void nativePlaceDoesNotExist(String comment); JNIEXPORT void JNICALL Java_com_mapswithme_maps_editor_Editor_nativePlaceDoesNotExist(JNIEnv * env, jclass clazz, jstring comment) { - g_framework->NativeFramework()->CreateNote(g_editableMapObject.GetLatLon(), g_editableMapObject.GetID(), - osm::Editor::NoteProblemType::PlaceDoesNotExist, jni::ToNativeString(env, comment)); + g_framework->NativeFramework()->CreateNote(g_editableMapObject, + osm::Editor::NoteProblemType::PlaceDoesNotExist, + jni::ToNativeString(env, comment)); } JNIEXPORT void JNICALL diff --git a/android/jni/com/mapswithme/util/HttpClient.cpp b/android/jni/com/mapswithme/util/HttpClient.cpp index 6677a9320c..a599b11030 100644 --- a/android/jni/com/mapswithme/util/HttpClient.cpp +++ b/android/jni/com/mapswithme/util/HttpClient.cpp @@ -105,14 +105,15 @@ void SetHeaders(ScopedEnv & env, jobject const params, RethrowOnJniException(env); using HeaderPair = std::unordered_map::value_type; - env->CallVoidMethod( - params, setHeaders, - jni::ToJavaArray(env.get(), g_httpHeaderClazz, headers, [](JNIEnv * env, - HeaderPair const & item) { - return env->NewObject(g_httpHeaderClazz, headerInit, - jni::TScopedLocalRef(env, jni::ToJavaString(env, item.first)).get(), - jni::TScopedLocalRef(env, jni::ToJavaString(env, item.second)).get()); - })); + auto headerFunc = [](JNIEnv * env, HeaderPair const & item) + { + jni::TScopedLocalRef first(env, jni::ToJavaString(env, item.first)); + jni::TScopedLocalRef second(env, jni::ToJavaString(env, item.second)); + return env->NewObject(g_httpHeaderClazz, headerInit, first.get(), second.get()); + }; + jni::TScopedLocalObjectArrayRef jHeaders(env.get(), jni::ToJavaArray(env.get(), g_httpHeaderClazz, + headers, headerFunc)); + env->CallVoidMethod(params, setHeaders, jHeaders.get()); RethrowOnJniException(env); } @@ -243,17 +244,15 @@ bool HttpClient::RunHttpRequest() env->GetStaticMethodID(g_httpClientClazz, "run", "(Lcom/mapswithme/util/HttpClient$Params;)Lcom/mapswithme/util/HttpClient$Params;"); - // Current Java implementation simply reuses input params instance, so we don't need to - // call DeleteLocalRef(response). - jobject const response = - env->CallStaticObjectMethod(g_httpClientClazz, httpClientClassRun, httpParamsObject.get()); + jni::ScopedLocalRef const response(env.get(), env->CallStaticObjectMethod(g_httpClientClazz, + httpClientClassRun, httpParamsObject.get())); if (jni::HandleJavaException(env.get())) return false; try { - GetInt(env, response, ids.GetId("httpResponseCode"), m_errorCode); - GetString(env, response, ids.GetId("receivedUrl"), m_urlReceived); + GetInt(env, response.get(), ids.GetId("httpResponseCode"), m_errorCode); + GetString(env, response.get(), ids.GetId("receivedUrl"), m_urlReceived); ::LoadHeaders(env, httpParamsObject.get(), m_headers); } catch (JniException const & ex) diff --git a/android/res/drawable-hdpi/img_whatsnew_driving_style.png b/android/res/drawable-hdpi/img_whatsnew_driving_style.png new file mode 100644 index 0000000000..5fa916b932 Binary files /dev/null and b/android/res/drawable-hdpi/img_whatsnew_driving_style.png differ diff --git a/android/res/drawable-hdpi/img_whatsnew_transliteration.png b/android/res/drawable-hdpi/img_whatsnew_transliteration.png new file mode 100644 index 0000000000..ac2bee5813 Binary files /dev/null and b/android/res/drawable-hdpi/img_whatsnew_transliteration.png differ diff --git a/android/res/drawable-mdpi/img_whatsnew_driving_style.png b/android/res/drawable-mdpi/img_whatsnew_driving_style.png new file mode 100644 index 0000000000..9ade1afaf3 Binary files /dev/null and b/android/res/drawable-mdpi/img_whatsnew_driving_style.png differ diff --git a/android/res/drawable-mdpi/img_whatsnew_transliteration.png b/android/res/drawable-mdpi/img_whatsnew_transliteration.png new file mode 100644 index 0000000000..0e25aefeb9 Binary files /dev/null and b/android/res/drawable-mdpi/img_whatsnew_transliteration.png differ diff --git a/android/res/drawable-v21/bg_tag_normal.xml b/android/res/drawable-v21/bg_tag_normal.xml new file mode 100644 index 0000000000..0cec1703a4 --- /dev/null +++ b/android/res/drawable-v21/bg_tag_normal.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + diff --git a/android/res/drawable-v21/bg_tag_normal_night.xml b/android/res/drawable-v21/bg_tag_normal_night.xml new file mode 100644 index 0000000000..fe7063cde5 --- /dev/null +++ b/android/res/drawable-v21/bg_tag_normal_night.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + diff --git a/android/res/drawable-v21/button_accent_round_normal.xml b/android/res/drawable-v21/button_accent_round_normal.xml new file mode 100644 index 0000000000..41a68cc12f --- /dev/null +++ b/android/res/drawable-v21/button_accent_round_normal.xml @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/android/res/drawable-v21/button_accent_round_normal_night.xml b/android/res/drawable-v21/button_accent_round_normal_night.xml new file mode 100644 index 0000000000..bc38fc84ab --- /dev/null +++ b/android/res/drawable-v21/button_accent_round_normal_night.xml @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/android/res/drawable-xhdpi/img_whatsnew_driving_style.png b/android/res/drawable-xhdpi/img_whatsnew_driving_style.png new file mode 100644 index 0000000000..cacfd45caf Binary files /dev/null and b/android/res/drawable-xhdpi/img_whatsnew_driving_style.png differ diff --git a/android/res/drawable-xhdpi/img_whatsnew_transliteration.png b/android/res/drawable-xhdpi/img_whatsnew_transliteration.png new file mode 100644 index 0000000000..8123006f07 Binary files /dev/null and b/android/res/drawable-xhdpi/img_whatsnew_transliteration.png differ diff --git a/android/res/drawable-xxhdpi/img_whatsnew_driving_style.png b/android/res/drawable-xxhdpi/img_whatsnew_driving_style.png new file mode 100644 index 0000000000..3baaad7aaf Binary files /dev/null and b/android/res/drawable-xxhdpi/img_whatsnew_driving_style.png differ diff --git a/android/res/drawable-xxhdpi/img_whatsnew_transliteration.png b/android/res/drawable-xxhdpi/img_whatsnew_transliteration.png new file mode 100644 index 0000000000..f7d6ea9492 Binary files /dev/null and b/android/res/drawable-xxhdpi/img_whatsnew_transliteration.png differ diff --git a/android/res/drawable-xxxhdpi/img_whatsnew_driving_style.png b/android/res/drawable-xxxhdpi/img_whatsnew_driving_style.png new file mode 100644 index 0000000000..4355942966 Binary files /dev/null and b/android/res/drawable-xxxhdpi/img_whatsnew_driving_style.png differ diff --git a/android/res/drawable-xxxhdpi/img_whatsnew_transliteration.png b/android/res/drawable-xxxhdpi/img_whatsnew_transliteration.png new file mode 100644 index 0000000000..ef84706293 Binary files /dev/null and b/android/res/drawable-xxxhdpi/img_whatsnew_transliteration.png differ diff --git a/android/res/drawable/bg_tag.xml b/android/res/drawable/bg_tag.xml new file mode 100644 index 0000000000..10c7f1900a --- /dev/null +++ b/android/res/drawable/bg_tag.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/android/res/drawable/bg_tag_night.xml b/android/res/drawable/bg_tag_night.xml new file mode 100644 index 0000000000..69073591c7 --- /dev/null +++ b/android/res/drawable/bg_tag_night.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/android/res/drawable/bg_tag_normal.xml b/android/res/drawable/bg_tag_normal.xml new file mode 100644 index 0000000000..ba06734fd7 --- /dev/null +++ b/android/res/drawable/bg_tag_normal.xml @@ -0,0 +1,13 @@ + + + + + + + + diff --git a/android/res/drawable/bg_tag_normal_night.xml b/android/res/drawable/bg_tag_normal_night.xml new file mode 100644 index 0000000000..69a512e14d --- /dev/null +++ b/android/res/drawable/bg_tag_normal_night.xml @@ -0,0 +1,13 @@ + + + + + + + + diff --git a/android/res/drawable/bg_tag_pressed.xml b/android/res/drawable/bg_tag_pressed.xml new file mode 100644 index 0000000000..9fb0b2f622 --- /dev/null +++ b/android/res/drawable/bg_tag_pressed.xml @@ -0,0 +1,13 @@ + + + + + + + + diff --git a/android/res/drawable/bg_tag_pressed_night.xml b/android/res/drawable/bg_tag_pressed_night.xml new file mode 100644 index 0000000000..bae4d055f6 --- /dev/null +++ b/android/res/drawable/bg_tag_pressed_night.xml @@ -0,0 +1,13 @@ + + + + + + + + diff --git a/android/res/drawable/bg_tag_selected.xml b/android/res/drawable/bg_tag_selected.xml new file mode 100644 index 0000000000..cfd0dc3d95 --- /dev/null +++ b/android/res/drawable/bg_tag_selected.xml @@ -0,0 +1,13 @@ + + + + + + + + diff --git a/android/res/drawable/bg_tag_selected_night.xml b/android/res/drawable/bg_tag_selected_night.xml new file mode 100644 index 0000000000..7f48c4e942 --- /dev/null +++ b/android/res/drawable/bg_tag_selected_night.xml @@ -0,0 +1,13 @@ + + + + + + + + diff --git a/android/res/drawable/button_accent_round.xml b/android/res/drawable/button_accent_round.xml new file mode 100644 index 0000000000..3a1913237f --- /dev/null +++ b/android/res/drawable/button_accent_round.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/android/res/drawable/button_accent_round_disabled.xml b/android/res/drawable/button_accent_round_disabled.xml new file mode 100644 index 0000000000..2bb7fd67cf --- /dev/null +++ b/android/res/drawable/button_accent_round_disabled.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/android/res/drawable/button_accent_round_disabled_night.xml b/android/res/drawable/button_accent_round_disabled_night.xml new file mode 100644 index 0000000000..4812137a29 --- /dev/null +++ b/android/res/drawable/button_accent_round_disabled_night.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/android/res/drawable/button_accent_round_night.xml b/android/res/drawable/button_accent_round_night.xml new file mode 100644 index 0000000000..231320010b --- /dev/null +++ b/android/res/drawable/button_accent_round_night.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/android/res/drawable/button_accent_round_normal.xml b/android/res/drawable/button_accent_round_normal.xml new file mode 100644 index 0000000000..26a305f8f4 --- /dev/null +++ b/android/res/drawable/button_accent_round_normal.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/android/res/drawable/button_accent_round_normal_night.xml b/android/res/drawable/button_accent_round_normal_night.xml new file mode 100644 index 0000000000..6b3ec343c8 --- /dev/null +++ b/android/res/drawable/button_accent_round_normal_night.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/android/res/drawable/button_accent_round_pressed.xml b/android/res/drawable/button_accent_round_pressed.xml new file mode 100644 index 0000000000..16cd98fa83 --- /dev/null +++ b/android/res/drawable/button_accent_round_pressed.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/android/res/drawable/button_accent_round_pressed_night.xml b/android/res/drawable/button_accent_round_pressed_night.xml new file mode 100644 index 0000000000..4c764c850c --- /dev/null +++ b/android/res/drawable/button_accent_round_pressed_night.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/android/res/drawable/divider_transparent_half.xml b/android/res/drawable/divider_transparent_half.xml new file mode 100644 index 0000000000..655f62d7d1 --- /dev/null +++ b/android/res/drawable/divider_transparent_half.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/android/res/drawable/divider_transparent.xml b/android/res/drawable/divider_transparent_quarter.xml similarity index 100% rename from android/res/drawable/divider_transparent.xml rename to android/res/drawable/divider_transparent_quarter.xml diff --git a/android/res/layout-land/place_page_details.xml b/android/res/layout-land/place_page_details.xml index 0e5cda78f6..e7e2704fb3 100644 --- a/android/res/layout-land/place_page_details.xml +++ b/android/res/layout-land/place_page_details.xml @@ -9,12 +9,12 @@ android:id="@+id/pp__details" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?ppBackground" android:overScrollMode="never"> + layout="@layout/divider_horizontal" + android:layout_width="match_parent" + android:layout_height="1dp" + android:layout_marginBottom="@dimen/margin_half"/> + + + android:background="?ppBackground" + android:orientation="vertical"> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + - + + - + + + + @@ -83,11 +121,9 @@ - - - + diff --git a/android/res/layout/hotels_filter.xml b/android/res/layout/hotels_filter.xml index 0f883b9464..c56e79577c 100644 --- a/android/res/layout/hotels_filter.xml +++ b/android/res/layout/hotels_filter.xml @@ -59,8 +59,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/header"/> - - - - - + + - + + + + diff --git a/android/res/layout/place_page_button_frame.xml b/android/res/layout/place_page_button_frame.xml index 664e5470ca..b6b24b08d2 100644 --- a/android/res/layout/place_page_button_frame.xml +++ b/android/res/layout/place_page_button_frame.xml @@ -1,8 +1,17 @@ - + android:layout_marginTop="@dimen/margin_base"> + + + diff --git a/android/res/layout/place_page_details.xml b/android/res/layout/place_page_details.xml index 9fc3ad1be1..7ae16a4539 100644 --- a/android/res/layout/place_page_details.xml +++ b/android/res/layout/place_page_details.xml @@ -8,60 +8,97 @@ + + - + android:background="?ppBackground" + android:orientation="vertical"> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + - + + - + + + + @@ -69,11 +106,9 @@ - - - + diff --git a/android/res/layout/place_page_local_ad.xml b/android/res/layout/place_page_local_ad.xml index c6fe51b834..ba63386059 100644 --- a/android/res/layout/place_page_local_ad.xml +++ b/android/res/layout/place_page_local_ad.xml @@ -2,12 +2,18 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/ll__local_ad" - style="@style/PlacePageItemFrame" - tools:showIn="@layout/place_page_details" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" tools:visibility="visible"> + + + diff --git a/android/res/layout/place_page_more.xml b/android/res/layout/place_page_more.xml index 1eaab75844..54f0bbd948 100644 --- a/android/res/layout/place_page_more.xml +++ b/android/res/layout/place_page_more.xml @@ -13,4 +13,7 @@ android:background="?clickableBackground" android:gravity="center" android:text="@string/details_on_bookingcom"/> + + + diff --git a/android/res/layout/place_page_taxi.xml b/android/res/layout/place_page_taxi.xml index 9015d740f2..fb9a904dc9 100644 --- a/android/res/layout/place_page_taxi.xml +++ b/android/res/layout/place_page_taxi.xml @@ -6,7 +6,8 @@ style="@style/PlacePageItemFrame" android:paddingTop="@dimen/placepage_taxi_padding_vert" android:paddingBottom="@dimen/placepage_taxi_padding_vert" - android:clickable="false"> + android:clickable="false" + android:background="?ppBackground"> عامل التصفية إعادة تعيين - تصنيف + + تصنيف من أي جيد جيد جداً @@ -995,7 +996,6 @@ اطلب تاكسي Uber مباشرة من التطبيق! طلب تاكسي غير متاح في وضع الطيران. طلب تاكسي غير متاح مؤقتا. - إعلان استخدام إنترنت المحمول لإظهار المعلومات التفصيلية؟ استخدام دائمًا اليوم فقط @@ -1072,10 +1072,29 @@ المزيد من المراجعات عن Booking.com اتصل بالإنترنت للحصول على مزيد من التفاصيل حول المكان. فشل تحميل المعلومات. + تحديث الخرائط + قم بتحديث الخرائط التي قمت بنتزيلها + تحديث الخرائط والاحتفاظ بالمعلومات حول الكائنات محدثة + تحديث (%s) + تحديث يدوياً في وقت لاحق شُقَق تخييم شاليه دار الضيافة نزُل منتج + الفندق + موتيل + مطالبة هذه الشركة + تم عمل إعلان عن الشركة + النوع + + تعقيب عام + تشغيل + إيقاف + نحن نستخدم نظام النص إلى كلام (TTS) للتعليمات الصوتية. تستخدم العديد من أجهزة Android نظام Google TTS، يمكنك تنزيله من أو تحديثه من Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + بالنسبة للغة العربية واليونانية والرومانية قد تحتاج إلى تثبيت نظام نص إلى كلام (TTS) إضافي (حيث إن نظام Google TTS لا يدعم اللغات بعد (من Google Play مثل Vocalizer TTS أو SVOX Classics.\nلإدارة الإعدادات لتخليق الكلام، في الجهاز الخاص بك افتح الإعدادات –> اللغة والإدخال –> الكلام –> إخراج نص إلى كلام. هنا يمكنك تنزيل حزمة لغة إضافية أو تحديد محرك النص إلى كلام المفضل. + لمزيد من المعلومات الرجاء مراجعة هذا الدليل. + كتابة بالحروف اللاتينية + إذا كان الشارع أو الهدف ليس له اسم بلغتك. فسيتم هجاؤه بالحروف اللاتينية. diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml index ff0cd0b5a2..083cac560d 100644 --- a/android/res/values-cs/strings.xml +++ b/android/res/values-cs/strings.xml @@ -970,7 +970,8 @@ Filtr Reset - Hodnocení + + Hodnocení od Jakékoli Dobré Velmi dobré @@ -996,7 +997,6 @@ Objednejte si taxi Uber přímo z aplikace! Objednání taxi není v režimu offline k dispozici. Objednání taxi není dočasně k dispozici. - Inzerce Použít mobilní internet ke zobrazení podrobnějších informací? Vždy použít Jen dnes @@ -1073,10 +1073,29 @@ Více recenzí na Booking.com Připojte se k Internetu a získejte více informací o tomto místě. Nepodařilo se načíst informace. + Aktualizuji mapy + Aktualizujte své stažené mapy + Aktualizace map zajišťuje aktuální informace o objektech + Aktualizace (%s) + Aktualizovat ručně později Byty Kempování Chalet|Horská chata Penzion Hostel Letovisko + Hotel + Motel + Zaregistruj si tento podnik + Podnik je propagován + Typ + + Všeobecné připomínky + Zapnout + Vypnout + Pro hlasové pokyny používáme systém TTS. Mnoho zařízení se systémem Android používá Google TTS, můžete si ho stáhnout nebo aktualizovat na Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + Pro arabštinu, řečtinu a rumunštinu budete muset nainstalovat další TTS (protože Google TTS zatím nepodporuje tyto jazyky) ze služby Google Play, např. Vocalizer TTS nebo SVOX Classics. \nChcete-li spravovat nastavení pro syntézu řeči, na svém zařízení otevřete Nastavení –> Jazyk a vstupy –> Mluvené slovo –> Převod textu na mluvené slovo. Zde si můžete stáhnout další balík jazyků nebo vybrat preferovaný nástroj pro převod textu na mluvené slovo. + Více informací najdete v tomto návodu. + Transliterace do latinky + Pokud ulice nebo objekt nemá název ve vašem jazyce, bude zobrazeno latinkou. diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml index e043c12475..288143544c 100644 --- a/android/res/values-da/strings.xml +++ b/android/res/values-da/strings.xml @@ -967,7 +967,8 @@ Filter Nulstil - Vurdering + + Vurdering fra Hvilken som helst God Meget god @@ -993,7 +994,6 @@ Bestil Uber taxi direkte fra app\'en! Det er ikke muligt at bestille en taxi i offlinetilstand. Bestilling af en taxi er ikke muligt lige nu. - Annonce Skal mobilt internet bruges til at vise detaljerede oplysninger? Brug altid Kun i dag @@ -1070,10 +1070,29 @@ Flere anmeldelser på Booking.com Opret forbindelse til internettet for at få flere oplysninger om stedet. Kunne ikke indlæse oplysningerne. + Opdaterer kort + Opdater dine downloadede kort + Opdatering af kort sikrer, at oplysningerne om objekter er aktuel + Opdater (%s) + Opdater manuelt senere Lejligheder Camping Hytte Gæstehus Hostel Resort + Hotel + Motel + Denne virksomhed tilhører mig + Virksomhed er annonceret + Type + + Generel feedback + Til + Fra + Vi bruger systemets TTS til stemmevejledning. Mange Android-enheder bruger Google TTS, du kan hente eller opdatere det via Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + I forbindelse med sprogene arabisk, græsk og rumænsk skal du installere yderligere TTS såsom som Vocalizer TTS eller SVOX Classics fra Google Play (eftersom Google TTS ikke understøtter disse sprog endnu). Hvis du vil administrere indstillinger for talesyntese på enheden, skal du åbne Indstillinger –> Sprog og input –> Tale –> Tekst til tale-output. Her kan du downloade yderligere sprogpakker eller vælge dit foretrukne tekst til tale-program. + Se denne vejledning for flere oplysninger. + Translitteration til latinsk + Hvis en gade eller et objekt ikke har et navn på dit sprog, vil det blive stavet ved hjælp af det latinske alfabet. diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml index f1049b75cd..9028a680b6 100644 --- a/android/res/values-de/strings.xml +++ b/android/res/values-de/strings.xml @@ -396,8 +396,6 @@ Kontaktieren Sie uns Feedback - - Allgemeine Rückmeldung Abonnieren Sie unsere News @@ -979,7 +977,8 @@ Filter Zurücksetzen - Bewertung + + Bewertung von Alle Gut Sehr gut @@ -1005,7 +1004,6 @@ Uber-Taxi direkt über die App bestellen! Das Bestellen eines Taxis ist im Offline-Modus nicht verfügbar. Das Bestellen eines Taxis ist vorübergehend nicht verfügbar. - Werbung Mobiles Internet verwenden, um genauere Informationen anzuzeigen? Immer verwenden Nur heute @@ -1082,10 +1080,29 @@ Weitere Bewertungen bei Booking.com Stellen Sie eine Verbindung zum Internet her, um weitere Informationen über den Ort zu erhalten. Informationen konnten nicht geladen werden. + Kartenaktualisierung + Aktualisieren Sie Ihre heruntergeladenen Karten + Das Aktualisieren der Karten sorgt dafür, dass die Objektinformationen stets auf dem neuesten Stand sind + Aktualisieren (%s) + Später manuell aktualisieren Appartements Zeltplatz Hütte Gästehaus Herberge Resort + Hotel + Motel + Ist das Ihr Unternehmen? + Es wird für das Unternehmen geworben + Art + + Allgemeines Feedback + An + Aus + Wir verwenden Text-to-Speech-Systeme für Sprachanweisungen. Viele Android-Geräte nutzen Google-TTS, das können Sie bei Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) herunterladen oder aktualisieren. + Für Arabisch, Griechisch und Rumänisch müssen Sie möglicherweise zusätzliche TTS-Systeme von Google Play herunterladen und installieren (denn Google-TTS unterstützt diese Sprachen bisher noch nicht), Sie können zum Beispiel Vocalizer TTS oder SVOX Classics verwenden. Um die Einstellungen für Sprachsynthese zu verwalten, gehen Sie auf Ihrem Gerät zu Einstellungen -> Sprache und Eingabe -> Sprache -> Text-to-Speech-Ausgabe. Hier können Sie zusätzliche Sprachpakete herunterladen oder das bevorzugte Versprachlichungsprogramm auswählen. + Weitere Informationen finden Sie in dieser Anleitung. + Transliteration ins Lateinische + Wenn eine Straße oder ein Objekt in Ihrer Sprache keinen Namen hat, wird er mit lateinischen Buchstaben geschrieben. diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml index a148473b41..490425d204 100644 --- a/android/res/values-el/strings.xml +++ b/android/res/values-el/strings.xml @@ -288,8 +288,6 @@ Επικοινωνήστε μαζί μας Σχόλια - - Γενικάό σχόλιο Εγγραφή στο ενημερωτικό μας δελτίο @@ -729,7 +727,8 @@ Φίλτρο Μηδενισμός - Βαθμολογία + + Βαθμολογία από Οποιοδήποτε Καλή Πολύ καλή @@ -755,7 +754,6 @@ Καλέστε ταξί Uber απευθείας μέσα από την εφαρμογή! Η παραγγελία ταξί δεν είναι διαθέσιμη σε offline ρύθμιση. Η παραγγελία ταξί είναι προσωρινά μη διαθέσιμη. - Διαφήμιση Θέλετε να χρησιμοποιήσετε το δίκτυο κινητής τηλεφωνίας για να εμφανίσετε αναλυτικές πληροφορίες; Να χρησιμοποιείται πάντα Μόνο σήμερα @@ -832,10 +830,29 @@ Περισσότερες κριτικές στο Booking.com Συνδεθείτε στο Internet για να λάβετε περισσότερες πληροφορίες για αυτό το μέρος. Η φόρτωση πληροφοριών απέτυχε. + Ενημέρωση χαρτών + Θα πρέπει να ενημερώστε τους χάρτες που έχετε κατεβάσει + Η ενημέρωση των χαρτών διατηρεί τις πληροφορίες των στοιχείων επικαιροποιημένες + Ενημέρωση (%s) + Χειροκίνητη ενημέρωση αργότερα Διαμερίσματα Κάμπινγκ Σαλέ Ξενώνας Πανδοχείο Θέρετρο + Ξενοδοχείο + Μοτέλ + Καταχωρήστε αυτήν την επιχείρηση + Η επιχείριση διαφημίζεται + Τύπος + + Γενικό σχόλιο + Ενεργ. + Απενεργ. + Χρησιμοποιούμε σύστημα TTS για τις φωνητικές οδηγίες. Αρκετές συσκευές Android χρησιμοποιούν Google TTS, μπορείτε να το κατεβάσετε ή να το ενημερώσετε από το Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + Για Αραβικά, Ελληνικά και Ρουμανικά ίσως χρειάζεται να εγκαταστήσετε συμπληρωματικό TTS (δεδομένου ότι το Google TTS δεν υποστηρίζει τις συγκεκριμένες γλώσσες προς το παρόν) από το Google Play όπως το Vocalizer TTS ή το SVOX Classics. \nΓια να αλλάξετε τις ρυθμίσεις της σύνθεσης ομιλίας, στη συσκευή σας ανοίξτε το μενού Ρυθμίσεις – > Γλώσσα και εισαγωγή – > Ομιλία – > Μετατροπή κειμένου σε ομιλία. Εδώ μπορείτε να κατεβάσετε συμπληρωματικά πακέτα γλώσσας ή να επιλέξετε τη μηχανή μετατροπής κειμένου σε ομιλία που προτιμάτε. + Για περισσότερες πληροφορίες δείτε αυτό τον οδηγό. + Μεταγραφή στα Λατινικά + Εάν ένας δρόμος ή ένα αντικείμενο δεν έχει όνομα στη γλώσσα σας, θα διατυπωθεί χρησιμοποιώντας το λατινικό αλφάβητο. diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml index b941f5ce57..764efe80f1 100644 --- a/android/res/values-es/strings.xml +++ b/android/res/values-es/strings.xml @@ -956,7 +956,8 @@ Filtrar Restablecer - Clasificación + + Con calificación desde Cualquier Bueno Muy bueno @@ -982,7 +983,6 @@ ¡Pide un taxi Uber directamente desde la aplicación! La opción para solicitar un taxi no se encuentra disponible en el modo sin conexión. La opción para solicitar un taxi se encuentra temporalmente no disponible. - Anuncio ¿Usar Internet móvil para mostrar información detallada? Usar siempre Solo hoy @@ -1059,10 +1059,29 @@ Más valoraciones en Booking.com Conéctese a internet para obtener más información sobre este lugar. No se ha podido cargar la información. + Actualizando mapas + Actualice sus mapas descargados + La actualización de mapas mantiene actualizada la información sobre objetos + Actualizar (%s) + Actualizar más tarde de forma manual Apartamentos Campamento Chalé Casa de huéspedes Albergue juvenil Resort + Hotel + Motel + Este negocio es mío + Anuncio destacado + Tipo + + Opinión general + Akt. + Desact. + Utilizamos el sistema TTS para las instrucciones de voz. Muchos dispositivos de Android usan Google TTS. Puede descargar o actualizarlo desde Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + Para los idiomas árabe, griego y rumano, es posible que necesite instalar un TTS adicional (puesto que Google TTS aún no incluye estos idiomas) desde Google Play, como Vocalizer TTS o SVOX Classics.\nPara administrar los ajustes de síntesis del habla, abra los Ajustes de su dispositivo –> Idioma e introducción –> Voz –> Opciones texto a voz. En este menú puede descargar un paquete de idioma especial o seleccionar un motor existente de conversión de texto a voz. + Para obtener más información, consulte esta guía. + Transliteración al alfabeto latino + Si una calle o un objeto no tiene nombre en su idioma, se escribirá con el alfabeto latino. diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml index a295d2fd58..7925d74715 100644 --- a/android/res/values-fi/strings.xml +++ b/android/res/values-fi/strings.xml @@ -963,7 +963,8 @@ Suodatin Palauta - Arvio + + Arvio vähintään Kaikki Hyvä Todella hyvä @@ -989,7 +990,6 @@ Tilaa Uber -taksi suoraan sovelluksesta! Taksin tilaaminen ei ole mahdollista ilman verkkoyhteyttä. Taksin tilaaminen ei ole tällä hetkellä mahdollista. - Mainos Näytetäänkö lisätiedot mobiili-internetillä? Käytä aina Vain tänään @@ -1066,10 +1066,29 @@ Lisää arvosteluja osoitteessa Booking.com Yhdistä internetiin saadaksesi lisätietoa paikasta. Tietojen lataaminen epäonnistui. + Päivitetään karttoja + Päivitä ladatut kartat + Karttojen päivittäminen pitää kohteita koskevat tiedot ajan tasalla + Päivitä (%s) + Päivitä manuaalisesti myöhemmin Loma-asunnot Retkeily Alppimaja Majatalo Hostelli Lomakohteet + Hotelli + Motelli + Ilmoittaudu yrityksen omistajaksi + Yritystä mainostetaan + Tyyppi + + Yleinen palaute + Käytössä + Ei käytössä + Käytämme ääniohjeisiin tekstistä puheeksi -järjestelmää. Monet Android-laitteet käyttävät Googlen tekstistä puheeksi -sovellusta, jonka voit ladata tai päivittää Google Playssä (https://play.google.com/store/apps/details?id=com.google.android.tts) + Arabian, kreikan ja romanian kieliä varten sinun täytyy mahdollisesti asentaa ylimääräinen tekstistä puheeksi -järjestelmä Google Playstä (koska Googlen tekstistä puheeksi -sovellus ei vielä tue näitä kieliä), kuten Vocalizer TTS tai SVOX Classic. Voit hallita tekstistä puheeksi -ominaisuuden asetuksia laitteellasi kohdassa Asetukset –> Kieli ja syöttötapa –> Puhe –> Tekstistä puheeksi -toisto. Täällä voit ladata uusia kielipaketteja tai valita haluamasi tekstistä puheeksi -ohjelman. + Lisätietoja saat tästä oppaasta. + Translitterointi latinaksi + Jos kadulla tai kohteella ei ole nimeä kielelläsi, se kirjoitetetaan latinalaisilla kirjaimilla. diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml index afb292792f..f7203d00a8 100644 --- a/android/res/values-fr/strings.xml +++ b/android/res/values-fr/strings.xml @@ -393,8 +393,6 @@ Contactez-nous Feedback - - Avis général S\'abonner à nos informations @@ -978,7 +976,8 @@ Filtrer Réinitialiser - Note + + Note à partir de N’importe quel Bon Très bon @@ -1004,7 +1003,6 @@ Commandez un taxi directement depuis l\'appli ! La commande d\'un taxi n\'est pas disponible en mode hors ligne. La commande d\'un taxi est temporairement indisponible. - Publicité Utiliser l\'Internet mobile pour afficher les informations détaillées? Toujours utiliser Aujourd\'hui seulement @@ -1081,10 +1079,29 @@ Plus d\'avis sur Booking.com Connectez-vous à Internet pour obtenir plus d’informations sur ce lieu. Impossible de charger les informations. + Mise à jour des cartes + Mettez à jour vos cartes téléchargées + Actualiser les cartes permet d\'actualiser également les informations sur les objets + Mettre à jour (%s) + Mettre à jour manuellement plus tard Appart\'hôtel Camping Chalet Maison d\'hôtes Auberge de jeunesse Complexe touristique + Hôtel + Motel + Cette entreprise m\'appartient + L\'entreprise est publiée + Type + + Feedback général + On + Off + Nous utilisons le système TTS pour les instructions vocales. De nombreux appareils Android utilisent Google TTS, vous pouvez le télécharger ou le mettre à jour depuis Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + Pour les langues arabe, grecque et roumaine, Il vous faudra peut-être installer un TTS supplémentaire (car Google TTS n\'est pas encore compatible avec ces langues) depuis Google Play tel que Vocalizer TTS ou SVOX Classics. Pour gérer les paramètres de synthèse vocale, ouvrez sur votre appareil Paramètres –> Langue et entrée – > Parole – > Texte en parole. Vous pouvez télécharger ici un package de langues supplémentaires ou sélectionner votre logiciel de synthèse vocale préféré. + Pour plus d’informations, veuillez consulter ce guide. + Translittération en latin + Si une rue ou un objet n’a pas de nom dans votre langue, l’alphabet latin sera utilisé pour l\'écrire. diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml index 55cab7b074..490c6c9bc4 100644 --- a/android/res/values-hu/strings.xml +++ b/android/res/values-hu/strings.xml @@ -963,7 +963,8 @@ Szűrő Alaphelyzetbe állítás - Minősítés + + Besorolás innentől Bármelyik Jó Nagyon jó @@ -989,7 +990,6 @@ Hívj Uber-taxit közvetlenül az alkalmazásból! Taxirendelés offline módban nem lehetséges. A taxirendelés átmenetileg nem elérhető. - Hirdetés Részletes információk megjelenítése a mobil internet segítségével? Mindig használja Csak ma @@ -1066,10 +1066,29 @@ További vélemények a Booking.com-on A helyszínről további tájékoztatást kaphat, ha csatlakozik az internethez. Nem sikerült betölteni az adatokat. + Térképek frissítése + Frissítse a letöltött térképeit + A térképek frissítésével naprakészen tarthatja az objektumokra vonatkozó adatokat + Frissítés (%s) + Kézi frissítés később Apartmanok Kemping Turistaház Vendégház Hostel Resort hotel + Szálloda + Motel + Igényelje ezt az üzletet + Hirdetett üzlet + Típus + + Általános visszajelzés + Be + Ki + TTS rendszert használunk a hangnavigációhoz. Sok Android-os készülék használja a Google TTS-t; töltse le vagy frissítse a Google Play áruházból (https://play.google.com/store/apps/details?id=com.google.android.tts) + Arab, görög és román nyelven szükség lehet arra, hogy további TTS-t telepítsen Google Play áruházból (mivel a Google TTS még nem támogatja a nyelveket), mint például a Vocalizer TTS-t vagy a SVOX Classics alkalmazást. \nBeszédszintézis beállításainak kezeléséhez nyissa meg készülékén a következőket: Beállítások–> Nyelv és adatbevitel-–>Beszéd –> Szöveg-beszéd átalakítás kimenet. Itt további nyelvi csomagokat tölthet le, kiválaszthatja a kívánt szöveg-beszéd motort. + További tájékoztatást találhat még ebben az útmutatóban. + Átírás latin nyelvre + Ha egy utcának vagy egy objektumnak nincs neve az Ön nyelvén, latin ábécével kerül átírásra. diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml index 59a45a7ab0..5db824e357 100644 --- a/android/res/values-in/strings.xml +++ b/android/res/values-in/strings.xml @@ -962,7 +962,8 @@ Filter Atur ulang - Peringkat + + Peringkat dari Apa saja Bagus Sangat Bagus @@ -988,7 +989,6 @@ Pesan taksi Uber langsung dari aplikasi! Memesan taksi tidak tersedia dalam modus offline. Memesan taksi untuk sementara tidak tersedia. - Iklan Gunakan internet seluler untuk memperlihatkan informasi terperinci? Selalu Gunakan Hanya Hari Ini @@ -1065,10 +1065,29 @@ Ulasan lain di Booking.com Sambungkan ke internet untuk mendapatkan informasi selengkapnya tentang tempat ini. Gagal memuat informasi. + Memperbarui peta + Perbarui peta yang sudah Anda unduh + Memperbarui peta membuat informasi tentang objek tetap terkini + Pembaruan (%s) + Perbarui secara manual nanti Apartemen Perkemahan Chalet Wisma tamu Hostel Sanggraloka + Hotel + Motel + Klaim bisnis ini + Bisnis diiklankan + Jenis + + Umpan Balik Umum + On + Mati + Kami menggunakan TTS sistem untuk petunjuk suara. Banyak perangkat Android menggunakan Google TTS, Anda dapat mengunduhnya dari Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + Untuk bahasa Arab, Yunani, dan Romania, Anda mungkin perlu menginstal TTS tambahan (karena Google TTS belum mendukung bahasa-bahasa ini) dari Google Play, seperti Vocalizer TTS atau SVOX Classics.\nUntuk mengelola pengaturan untuk sintesis suara, pada perangkat Anda buka Settings (Pengaturan) –> Language and input (Bahasa dan input) –> Speech (Tuturan) –> Text to speech output (Output teks ke tuturan). Di sini Anda dapat mengunduh paket bahasa tambahan atau memilih mesin teks ke tuturan yang diinginkan. + Untuk informasi selengkapnya, bacalah panduan ini. + Transliterasi ke dalam bahasa Latin + Jika jalan atau objek tidak memiliki nama dalam bahasa Anda, namanya akan dieja menggunakan alfabet Latin. diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml index dffd35fd6c..211c5e8c7d 100644 --- a/android/res/values-it/strings.xml +++ b/android/res/values-it/strings.xml @@ -962,7 +962,8 @@ Filtro Reimposta - Voto + + Voto da Qualsiasi Buono Molto buono @@ -988,7 +989,6 @@ Prenota un taxi Uber direttamente dalla app! La chiamata taxi non è disponibile in modalità offline. La chiamata taxi è temporaneamente non disponibile. - Annuncio Usare l\'Internet mobile per mostrare le informazioni dettagliate? Usa sempre Solo oggi @@ -1065,10 +1065,29 @@ Altre recensioni su Booking.com Connettiti a Internet per ottenere maggiori informazioni sul luogo. Impossibile caricare le informazioni. + Aggiornamento mappe + Aggiorna le mappe scaricate + Aggiornamento mappe mantiene aggiornate le informazioni sugli oggetti + Aggiorna (%s) + Aggiorna manualmente più tardi Residence Campeggio Chalet Guest house Ostello Resort + Hôtel + Motel + Rivendica questa attività + Attività pubblicizzata + Tipo + + Feedback generale + On + Off + Usiamo il TTS di sistema per le istruzioni vocali. Molti dispositivi Android utilizzano Google TTS, che puoi scaricare o aggiornare da Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + Per l\'arabo, il greco e il rumeno, potrebbe essere necessario installare un servizio TTS aggiuntivo (poiché Google TTS non supporta ancora queste lingue) da Google Play, ad esempio Vocalizer TTS o SVOX Classics.\nPer gestire le impostazioni di sintesi vocale, dal tuo dispositivo apri Impostazioni –> Lingua e input –> Riconoscimento vocale –> Output sintesi vocale. Qui puoi scaricare il language pack aggiuntivo o selezionare il tuo motore di sintesi vocale preferito. + Per maggiori informazioni, consulta questa guida. + Traslitterazione in latino + Se una strada o un oggetto non ha un nome nella tua lingua, tale nome sarà scritto utilizzando l\'alfabeto latino. diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml index 20031dc19c..639a30a3dd 100644 --- a/android/res/values-ja/strings.xml +++ b/android/res/values-ja/strings.xml @@ -962,7 +962,8 @@ フィルター リセット - 評価 + + 指定評価以上 すべて 良い 非常に良い @@ -988,7 +989,6 @@ アプリから直接Uberの配車リクエストができます！ タクシーの予約がオフラインモードでは使用できません。 タクシーの予約が一時的に使用できません。 - 広告 モバイルインターネットを使用して詳細な情報を表示しますか？ 常に使用 今日だけ @@ -1065,10 +1065,29 @@ Booking.com の詳細レビュー この場所に関する詳細情報を取得するには、インターネットに接続してください。 情報の読み込みに失敗しました。 + 地図を更新中 + ダウンロード済みのマップを更新してください + 地図を更新することで物件情報を最新の状態に保ちます + 更新 (%s) + あとで手動で更新 アパート ^キャンプ場 シャレー|山小屋 ゲストハウス ホステル リゾート + ホテル + モーテル + この企業の所有者であることを報告 + 企業は宣伝中です + 種類 + + 一般的なフィードバック + オン + オフ + 音声案内にはシステムの TTS を使用します。多くの Android 端末が Google の TTS を使用しており、Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) からダウンロードや更新を行うことができます。 + アラビア語、ギリシャ語、ルーマニア語では Vocalizer TTS や SVOX Classics のような追加の TTS を Google Play からインストールする必要があるかもしれません（Google TTS がまだこれらの言語をサポートしていないため）。\n音声合成の設定を管理するには、お使いのデバイスで [設定] –> [言語と入力] –> [音声] –> [テキスト読み上げの出力] を開きます。こここで追加の言語パックをダウンロードしたり、お好みの音声合成エンジンを選択することができます。 + 詳細については、このガイドをご確認ください。 + ラテン文字への字訳 + 通り名や物件名をあなたの言語で表示できない場合、ラテン文字のアルファベットで綴られます。 diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml index 87522ef758..4c06883b4a 100644 --- a/android/res/values-ko/strings.xml +++ b/android/res/values-ko/strings.xml @@ -959,7 +959,8 @@ 필터 재설정 - 평가 + + 등급 모두 양호 매우 양호 @@ -985,7 +986,6 @@ Uber 택시를 직접 앱에서 예약하세요. 오프라인 모드에서는 택시를 예약할 수 없습니다. 일시적으로 택시를 예약할 수 없습니다. - 광고 모바일 인터넷을 사용하여 자세한 정보를 표시하시겠습니까? 항상 사용 오늘만 @@ -1062,10 +1062,29 @@ Booking.com의 추가 리뷰 인터넷에 연결하여 그곳에 대한 자세한 정보를 얻으세요. 정보를 로드하지 못했습니다. + 지도 업데이트 + 다운로드한 지도를 업데이트해야 합니다 + 지도를 업데이트하면 개체에 대한 정보가 최신 상태로 유지됩니다. + 업데이트(%s) + 나중에 수동으로 업데이트 아파트 ^캠핑 별장 영빈관|호스텔 호스텔 리조트 + 호텔 + 모텔 + 이 비즈니스 클레임 + 비즈니스 광고를 하고 있습니다. + 유형 + + 일반 피드백 + 켜기 + 끄기 + 당사는 음성 지침을 위해 시스템 TTS를 사용합니다. 많은 Android 장치에서 Google TTS를 사용합니다. Google Play(https://play.google.com/store/apps/details?id=com.google.android.tts)에서 Google TTS를 다운로드하거나 업데이트할 수 있습니다. + 아랍어, 그리스어 및 루마니아어의 경우 Google Play에서 Vocalizer TTS 또는 SVOX Classic 같은 추가적인 TTS(Google TTS는 해당 언어를 아직 지원하지 않음)를 설치해야 할 수 있습니다.\n음성 합성에 대한 설정을 관리하려면 장치에서 설정 -> 언어 및 입력 -> 음성 -> 음성으로 읽어주기 설정을 엽니다. 여기에서 추가적인 언어 팩을 다운로드하거나 기본 음성으로 읽어주기 엔진을 선택할 수 있습니다. + 자세한 내용을 보려면 이 가이드를 확인하세요. + 라틴어로 음역 + 거리 또는 개체에 사용자 언어로 된 이름이 없는 경우, 라틴 알파벳을 사용하여 나옵니다. diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml index 15f8090ca5..756c953b79 100644 --- a/android/res/values-nb/strings.xml +++ b/android/res/values-nb/strings.xml @@ -961,7 +961,8 @@ Filter Tilbakestille - Vurdering + + Rangering fra Hvilken som helst Bra Veldig bra @@ -987,7 +988,6 @@ Bestill en Uber-drosje direkte fra appen! Bestilling av taxi er ikke mulig i offlinemodus. Bestilling av taxi er ikke tilgjengelig for øyeblikket. - Reklame Bruke mobilt Internett til å vise detaljert informasjon? Bruk alltid Bare i dag @@ -1064,10 +1064,29 @@ Flere anmeldelser på Booking.com Koble til internett for å få mer informasjon om stedet. Kunne ikke laste inn informasjon. + Oppdaterer kart + Oppdater dine nedlastede kart + Ved å oppdatere kart holder du også informasjonen om ulike elementer oppdatert + Oppdater (%s) + Oppdater manuelt senere Leiligheter Overnatting i bobiler Chalet Gjestehus Vandrerhjem Ferieresort + Hotell + Motell + Dette er min bedrift + Virksomheten er annonsert + Type + + Generell tilbakemelding + På + Av + Vi bruker system TTS for stemmeveiledning. Mange Android-enheter bruker Google TTS, Du kan laste ned eller oppdatere via Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + Du må installere ekstra TTS for arabisk, gresk og rumensk (siden Google TTS ikke støtter språkene ennå) fra Google Play, som for eksempel Vocalizer TTS eller SVOX Classics.\nFor å behandle innstillinger for talesyntese, gå til Innstillinger -> Språk og inndata -> Tale-> Tekst til tale. Her kan du laste ned flere språkpakker eller velg foretrukket tekst til tale-motor. + Les denne veiledningen for mer informasjon. + Omskrivning til latin + Hvis en gate eller et element ikke har et navn på ditt språk, vil det bli skrevet med det latinske alfabetet. diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml index 7edc929fb9..1e9214cdb8 100644 --- a/android/res/values-nl/strings.xml +++ b/android/res/values-nl/strings.xml @@ -963,7 +963,8 @@ Filter Resetten - Beoordeling + + Rating van Alle Goed Heel Goed @@ -989,7 +990,6 @@ Bestel een Uber-taxi rechtstreeks vanuit de app! Het bestellen van een taxi is niet beschikbaar in de offline modus. Het bestellen van een taxi is tijdelijk niet beschikbaar. - Reclame Mobiel internet gebruiken om gedetailleerde informatie weer te geven? Altijd Gebruiken Enkel Vandaag @@ -1066,10 +1066,29 @@ Meer beoordelingen op Booking.com Maak verbinding met het internet om meer informatie over de plaats te krijgen. Informatie laden mislukt. + Kaarten bijwerken + Werk uw gedownloade kaarten bij + Kaarten bijwerken houdt de informatie over objecten actueel + Bijwerken (%s) + Later handmatig bijwerken Appartementen Camping Chalet Gasthuis Hostel Complex + Hotel + Motel + Dit bedrijf claimen + Bedrijf wordt geadverteerd + Type + + Algemene Feedback + Aan + Uit + We gebruiken het TTS-systeem voor gesproken instructies. Vele Android toestellen gebruiken Google TTS, u kunt het downloaden of bijwerken in Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + Voor Arabische, Griekse en Roemeense talen dient u mogelijk aanvullende TTS te installeren (aangezien Google TTS de talen nog niet ondersteunt) in Google Play, zoals Vocalizer TTS of SVOX Classics.\nOm instellingen voor spraaksynthese te beheren, open op uw toestel Instellingen -> Taal en invoer -> Spraak -> Uitvoer voor tekst-naar-spraak. Hier kunt u aanvullende taalpakketten downloaden of de tekst-naar-spraak engine van uw voorkeur selecteren. + Gelieve deze handleiding te lezen voor meer informatie. + Transliteratie in het Latijn + Indien een straat of object geen naam heeft in uw taal, wordt deze gespeld door gebruik van het Latijns alfabet. diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml index 578a11c920..55d86d787a 100644 --- a/android/res/values-pl/strings.xml +++ b/android/res/values-pl/strings.xml @@ -385,8 +385,6 @@ Skontaktuj się z nami Opinia - - Ogólne opinie Subskrybuj nasze wiadomości @@ -968,7 +966,8 @@ Filtr Resetuj - Ocena + + Ocena od Wszelkie Dobrze Bardzo dobrze @@ -994,7 +993,6 @@ Zamów taksówkę Uber bezpośrednio z aplikacji! Zamawianie taksówek nie jest dostępne w trybie offline. Zamawianie taksówek jest tymczasowo niedostępne. - Reklama Wykorzystać internet mobilny, aby wyświetlić dane szczegółowe? Stosuj zawsze Tylko dzisiaj @@ -1071,10 +1069,29 @@ Więcej opinii na Booking.com Połącz się z Internetem, aby uzyskać więcej informacji na temat miejsca. Nie można załadować informacji. + Aktualizacja map + Zaktualizuj pobrane mapy + Aktualizacja map umożliwia uzyskanie bieżących informacji o obiektach + Zaktualizuj (%s) + Zaktualizuj ręcznie później Apartamenty Kamping Domek letniskowy Pensjonat Hostel Dom wczasowy + Hotel + Motel + Zweryfikuj jako moja firma + Firma jest reklamowana + Typ + + Ogólne uwagi + Wł. + Wył. + Stosujemy system TTS dla komend głosowych. Stosuje go wiele urządzeń z systemem Android, można go pobrać lub zaktualizować z Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + Do obsługi języka arabskiego, greckiego i rumuńskiego koniecznie może być zainstalowanie dodatkowych systemów TTS (Google TTS nie obsługuje obecnie tych języków) z Google Play, takich jak Vocalizer TTS lub SVOX Classics. Aby zarządzać ustawieniami dla syntezy mowy, na swoim urządzeniu otwórz Ustawienia –> Język i wprowadzanie – > Mowa – > Wyjście tekstu na mowę. Tutaj można pobrać dodatkowe pakiety językowe lub wybrać preferowane silniki konwersji tekstu na mowę. + Aby uzyskać więcej informacji, sprawdź ten poradnik. + Transkrypcja na alfabet łaciński + Jeśli dana ulica lub obiekt nie posiada nazwy w twoim języku, ich nazwa zapisana zostanie w alfabecie łacińskim. diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml index 8cee6932d1..02debf709e 100644 --- a/android/res/values-pt/strings.xml +++ b/android/res/values-pt/strings.xml @@ -962,7 +962,8 @@ Filtrar Redefinir - Classificação + + Com classificação desde Qualquer Bom Muito bom @@ -988,7 +989,6 @@ Chame um táxi Uber diretamente do aplicativo! O serviço de táxi não está disponível no modo off-line. O serviço de táxi está temporariamente indisponível. - Anúncio Utilizar a internet móvel para mostrar informações detalhadas? Utilizar Sempre Apenas Hoje @@ -1065,9 +1065,29 @@ Mais opiniões em Booking.com Efetue ligação à internet para obter mais informações sobre o local. Falha ao carregar informações. + Atualização de mapas + Atualize seus mapas transferidos + Atualizar os mapas mantém atualizada a informação sobre objetos + Atualização (%s) + Atualizar manualmente mais tarde Apartamentos + Acampamento Chalé Casa de hóspedes Hostel Resort + Hotel + Motel + Reivindicar este negócio + Negócio publicitado + Tipo + + Opinão geral + Lig. + Deslig. + Utilizamos o sistema TTS para instruções de voz. Muitos dispositivos Android usam o Google TTS, pode transferir ou atualizá-lo a partir do Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + Para os idiomas árabe, grego e romeno: é possível que tenha de instalar TTS adicionais (uma vez que o Google TTS ainda não inclui estes idiomas) a partir do Google Play, como o Vocalizer TTS ou o SVOX Classics. Para gerir as configurações de síntese de fala, no seu dispositivo, vá a Configurações – > idioma e entrada – > voz – > saída de texto para voz. Aqui pode transferir um pacote de idioma adicional ou selecionar um motor de texto para voz. + Para obter mais informações, consulte este guia. + Transliteração para o latim + Se uma rua ou um objeto não tiver nome na sua língua, será utilizado o alfabeto latino. diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml index 14b75cdbf2..3f82f27100 100644 --- a/android/res/values-ro/strings.xml +++ b/android/res/values-ro/strings.xml @@ -959,7 +959,8 @@ Filtrare Resetare - Clasificare + + Evaluări de la Oricare Bine Foarte bine @@ -985,7 +986,6 @@ Comandați un taxi Uber direct din aplicație! Comandarea unui taxi nu se poate face în modul offline. Comandarea unui taxi este momentan indisponibilă. - Reclamă Folosiți internetul mobil pentru a afişa informaţii detaliate? Folosiți întotdeauna Doar astăzi @@ -1062,10 +1062,29 @@ Mai multe recenzii pe Booking.com Conectați-vă la internet pentru a primi mai multe informații despre locație. Încărcarea informațiilor a eșuat. + Se actualizează hărțile + Actualizați hărțile descărcate + Actualizarea hărților vă ajută să păstrați actualizate informațiile despre obiecte + Actualizare (%s) + Actualizare manuală mai târziu Apartamente Camping Cabană Pensiune Hostel Stațiuni + Hotel + Motel + Revendicați această afacere + Afacerea este promovată + Tip + + Feedback general + Activat + Dezactivat + Pentru instrucțiuni vocale utilizăm sistemul TTS. Multe dispozitive cu Android folosesc Google TTS. Puteți descărca sau actualiza aplicația din Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + Pentru limbile arabă, greacă și română ar putea fi necesar să instalați alte aplicații TTS (deoarece Google TTS nu oferă încă suport pentru aceste limbi) din Google Play, ca de exemplu Vocalizer TTS sau SVOX Classics.\nPentru setarea sintetizatorului vocal, deschideți pe dispozitiv Setări –> Limbă și introducere –> Voce –> Text. De aici puteți descărca pachete de limbi suplimentare sau selecta motorul preferat de transcriere vocală. + Consultați acest ghid pentru informații suplimentare. + Transcriere în alfabet latin + Dacă o stradă sau un obiect nu are un nume în limba dvs., va fi exprimat utilizând alfabetul latin. diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml index 91ad56aee5..e45b7e3504 100644 --- a/android/res/values-ru/strings.xml +++ b/android/res/values-ru/strings.xml @@ -304,11 +304,6 @@ Общие настройки Информация - - Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.). - - For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device\'s settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine. - Для получения дополнительной информации, пожалуйста, ознакомьтесь с руководством. Карта @@ -405,8 +400,6 @@ Свяжитесь с нами Связаться с нами - - Отправить отзыв Подписаться на новости @@ -989,7 +982,8 @@ Фильтр Сбросить - Рейтинг + + Рейтинг от Любой Хорошо Очень хорошо @@ -1015,7 +1009,6 @@ Закажите такси прямо из приложения! Заказ такси недоступен офлайн. Заказ такси временно недоступен. - Реклама Загружать дополнительную информацию через мобильный интернет? Всегда Только сегодня @@ -1103,7 +1096,18 @@ Гостевой дом Хостел Дом отдыха + Гостиница Мотель + Я владелец компании + Эта компания рекламируется + Тип + + Отправить отзыв Вкл. Выкл. + Подсказки озвучиваются системным ситнтезатором речи (TTS). На многих устройствах используется Google TTS, его можно загрузить или обновить в Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + Для арабского, греческого и румынского языков, возможно, необходимо установить дополнительный синтезатор речи (TTS) из Google Play, например, Vocalizer TTS or SVOX Classics, так как Google TTS пока не поддерживает эти языки. Чтобы настроить синтезатор речи, перейдите в Настройки -> Язык и ввод -> Синтез речи. Здесь можно установить допольнительные языковые пакеты или выбрать синтезатор речи. + Более подробная информация — в этом руководстве. + Латинская транслитерация + Если у улицы или объекта нет названия на вашем языке, то мы покажем его латиницей. diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml index bf74ecd7fd..7e922a6f6d 100644 --- a/android/res/values-sk/strings.xml +++ b/android/res/values-sk/strings.xml @@ -966,7 +966,8 @@ Filter Obnoviť - Hodnotenie + + Hodnotenie nad Akékoľvek Dobré Veľmi dobré @@ -992,7 +993,6 @@ Objednajte si Uber priamo z aplikácie! Objednanie taxíka nie je k dispozícii v režime offline. Objednanie taxíka je dočasne nedostupné. - Reklama Použiť mobilný internet na zobrazenie podrobnejších informácií? Vždy použiť Iba dnes @@ -1069,10 +1069,29 @@ Viac recenzií na Booking.com Viac informácií o mieste získate po pripojení na internet. Nepodarilo sa načítať informácie. + Prebieha aktualizácia máp + Aktualizujte svoje stiahnuté mapy + Vďaka aktualizácii máp budú informácie o objektoch na mape aktualizované + Aktualizovať (%s) + Manuálne aktualizovať neskôr Apartmány Camping Chata Penzión Hostel Rezort + Hotel + Motel + Nárokovať záznam firmy + Firma sa inzeruje + Typ + + Všeobecné pripomienky + Zap. + Vyp. + Na hlasové pokyny používame systém TTS. Mnohé zariadenia s Adroidom používajú Google TTS, ktorý si môžete stiahnuť alebo aktualizovať z obchodu Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + Pre arabčinu, gréčtinu a rumunčinu bude potrebné z obchodu Google Play nainštalovať dodatočné TTS (keďže Google tieto jazyky ešte nepodporuje) ako Vocalizer TTS alebo SVOX Classics. Ak chcete nastaviť nastavenia na syntézu reči, otvorte v zariadení Nastavenia -> Jazyk a vstup -> Reč -> Výstup textu na reč. Tam si môžete prevziať dodatočný jazykový balík alebo si vybrať preferovaný systém prevodu textu na reč. + Viac informácií nájdete v tomto návode. + Prepis do latinčiny + Ak ulica alebo objekt nemá názov vo vašom jazyku, prepíše sa tento názov latinkou. diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml index 63d8ec6847..25380bb9c0 100644 --- a/android/res/values-sv/strings.xml +++ b/android/res/values-sv/strings.xml @@ -967,7 +967,8 @@ Filter Återställ - Betyg + + Betyg från Vilket som helst Bra Väldigt bra @@ -993,7 +994,6 @@ Beställ en Uber direkt från appen! Du kan inte beställa en taxi i offlineläge. Du kan inte beställa en taxi just nu. - Annons Använd mobilt nätverk för att visa detaljerad information? Använd alltid Endast idag @@ -1070,10 +1070,29 @@ Fler omdömen på Booking.com\u0020 Anslut till internet för att hämta mer information om platsen. Det gick inte att ladda informationen. + Uppdaterar kartor + Uppdatera dina nedladdade kartor + Uppdatering av kartor håller information om objekt uppdaterade + Uppdatera (%s) + Uppdatera senare manuellt Lägenheter Camping Stuga Gästhus|vandrarhem Vandrarhem Resorter + Hotell + Motell + Gör anspråk på det här företaget + Företaget marknadsförs + Typ + + Allmän feedback + På + Av + Vi använder TTS-system för röstinstruktioner. Flera Android-enheter använder Google TTS. Du kan ladda ned eller uppdatera det på Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + För arabiska, grekiska och rumänska måste du kanske installera ytterligare TTS (eftersom Google TTS inte stödjer dessa språk ännu) från Google Play, som till exempel Vocalizer TTS eller SVOX Classics.\nFör att hantera talsyntesinställningar på din enhet, öppna Inställningar –> Språk och inmatning –> Tal –> Text till tal-uppspelning. Här kan du ladda ned flera språkpaket eller välja den text till tal-motor som du föredrar. + Kolla in den här guiden för mer information. + Transkribering till latin + Om en gata eller ett objekt saknar ett namn på ditt språk kommer det att stavas med det latinska alfabetet. diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml index 826c64d43e..4e0ee5e6a5 100644 --- a/android/res/values-th/strings.xml +++ b/android/res/values-th/strings.xml @@ -969,7 +969,8 @@ ตัวกรอง รีเซ็ต - อันดับ + + คะแนนตั้งแต่ อะไรก็ได้ ดี ดีมาก @@ -995,7 +996,6 @@ เรียกแท็กซี่ Uber โดยตรงจากแอป! ไม่สามารถทำการจองแท็กซี่ได้ในโหมดออฟไลน์ ไม่สามารถทำการจองแท็กซี่ได้ชั่วคราว - โฆษณา ใช้อินเทอร์เน็ตมือถือแสดงข้อมูลโดยรายละเอียดหรือไม่? ใช้เสมอ วันนี้เท่านั้น @@ -1072,10 +1072,29 @@ รีวิวเพิ่มเติมบน Booking.com เชื่อมต่ออินเทอร์เน็ตเพื่อรับข้อมูลเพิ่มเติมเกี่ยวกับสถานที่ ไม่สามารถโหลดข้อมูลได้ + กำลังอัปเดตแผนที่ + อัปเดตแผนที่ที่คุณดาวน์โหลดมา + การอัปเดตแผนที่จะคงข้อมูลเกี่ยวกับจุดหมายต่าง ๆ ให้ล่าสุดอยู่เสมอ + อัปเดต (%s) + อัปเดตด้วยตนเองภายหลัง อพาร์ตเมนต์ การตั้งแคมป์ ชาเลต์ เกสท์เฮ้าส์ หอพัก รีสอร์ต + โรงแรม + โมเต็ล + อ้างสิทธิ์ในธุรกิจนี้ + ธุรกิจได้รับการโฆษณาแล้ว + ประเภท + + ข้อเสนอแนะทั่วไป + เปิด + ปิด + เราใช้ระบบ TTS สำหรับคำแนะนำด้วยเสียงพูด เครื่องแอนดรอยด์จำนวนมากใช้งาน Google TTS คุณสามารถดาวน์โหลดหรืออัปเดตได้จาก Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + สำหรับภาษาอาหรับ กรีก และโรมาเนีย คุณอาจจำเป็นต้องติดตั้ง TTS (เนื่องจาก Google TTS ยังไม่ได้รองรับภาษาเหล่านี้) เพิ่มเติมจาก Google Play อย่างเช่น Vocalizer TTS หรือ SVOX Classics\nในการที่จะจัดการการตั้งค่าสำหรับการสังเคราะห์เสียงพูด เปิด การตั้งค่า –> ภาษาและอินพุต –> เสียงพูด –> เอาท์พุตการแปลงข้อความไปเป็นเสียงพูด บนเครื่องของคุณ ซึ่งคุณสามารถดาวน์โหลดชุดภาษาเพิ่มเติมหรือเลือกเอนจินการแปลงข้อความไปเป็นเสียงพูดที่ชอบได้ + สำหรับข้อมูลเพิ่มเติม กรุณาเข้าชมคำแนะนำนี้ + การทับศัพท์เป็นภาษาละติน + หากถนนหรือเป้าหมายไม่มีชื่อในภาษาของคุณก็จะสะกดโดยใช้ตัวอักษรละติน diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml index 0e887dd0d6..923946c194 100644 --- a/android/res/values-tr/strings.xml +++ b/android/res/values-tr/strings.xml @@ -969,7 +969,8 @@ Filtre Sıfırla - Oy Verin + + En düşük derece Herhangi biri İyi Çok iyi @@ -995,7 +996,6 @@ Doğrudan uygulamadan Uber taksi isteyin! Taksi çağırma çevrimdışı modda kullanılamıyor. Taksi çağırma geçici olarak kullanılamıyor. - Reklam Ayrıntılı bilgileri görüntülemek için mobil internet kullanılsın mı? Her zaman kullan Sadece Bugün @@ -1072,10 +1072,29 @@ Booking.com hakkında daha fazla değerlendirme Yerle ilgili daha fazla bilgi almak için internete bağlanın. Bilgiler yüklenemedi. + Haritalar güncelleniyor + İndirdiğiniz haritaları güncelleyin + Haritaları güncellemek, nesnelerle ilgili bilgilerin güncel kalmasını sağlar + Güncelle (%s) + Daha sonra manüel olarak güncelle Apart otel Kamp alanı Chalet Misafir evi Pansiyon Tatil köyü + Otel + Motel + Bu iş yerinin sahibiyim + İşletme reklamı verildi + Tür + + Genel Geribildirim + Aç + Kapat + Sesli talimatlar için TTS sistemini kullanıyoruz. Çoğu Android cihaz, Google TTS\'yi kullanıyor, Uygulamayı, Google Play\'den indirebilir veya güncelleyebilirsiniz (https://play.google.com/store/apps/details?id=com.google.android.tts) + Arapça, Yunanca ve Rumence dilleri için Google Play\'den Vocalizer TTS veya SVOX Classics gibi ek TTS (Google TTS, henüz bu dilleri desteklememektedir) uygulamalarını yüklemeniz gerekebilir. Ses sentezi ayarlarını yönetmek için cihazınızda Ayarlar -> Dil ve giriş -> Konuşma -> Konuşmayı metne dönüştür seçeneklerini etkinleştirin. Buradan, ek dil paketini indirebilir veya tercih ettiğiniz metin okuma motorunu seçebilirsiniz. + Daha fazla bilgi için lütfen bu kılavuzu inceleyin. + Latince alfabesine çevirme + Bir caddenin veya bir nesnenin adının kendi dilinizde mevcut olmaması durumunda, Latin alfabesi kullanılarak yazılır. diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml index b7fe0a48ee..6c4d52b416 100644 --- a/android/res/values-uk/strings.xml +++ b/android/res/values-uk/strings.xml @@ -967,7 +967,8 @@ Фільтр Скинути - Рейтинг + + Рейтинг від Будь-який Добре Дуже добре @@ -993,7 +994,6 @@ Замовляйте таксі прямо з додатку! Замовлення таксі неможливе в автономному режимі. Замовлення таксі тимчасово недоступне. - Реклама Використовувати мобільні дані для перегляду докладної інформації? Завжди Тільки сьогодні @@ -1070,10 +1070,29 @@ Більше відгуків на Booking.com Підключіться до мережі Інтернет, щоб отримати більше інформації про місце. Не вдалося завантажити інформацію. + Оновлення карт + Оновити завантажені карти + Оновлення карт дозволяє підтримувати інформацію про об\'єкти в актуальному стані + Оновити (%s) + Оновити вручну пізніше Апартаменти Кемпінг Шале Гостинний дім Хостел Будинок відпочинку + Готель + Мотель + Я — власник + Ця компанія рекламується + Тип + + Загальний відгук + Увімкн. + Вимкн. + Для озвучування голосових інструкцій ми використовуємо систему TTS. Більшість Android-пристроїв підтримують систему Google TTS. Для завантаження або оновлення перейдіть до магазину Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + Для арабської, грецької та румунської мов можливо вам знадобиться встановити додаткову систему TTS (наразі Google TTS не підтримує ці мови) з магазину Google Play — наприклад, Vocalizer TTS або SVOX Classics.\nДля управління налаштуваннями синтезу мови відкрийте на вашому пристрої Налаштування –> Мова та введення –> Мовлення –> Перетворення тексту на мовлення. Тут ви можете завантажити додатковий мовний пакет або вибрати інструмент для перетворення тексту на мовлення. + Додаткову інформацію див. у цьому керівництві. + Транслітерація латинськими літерами + Якщо для вулиці чи об\\\'єкта відсутня назва українською мовою, використовуватиметься назва, транслітерована латинськими літерами. diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml index b9db9d6c88..a397cdd91b 100644 --- a/android/res/values-vi/strings.xml +++ b/android/res/values-vi/strings.xml @@ -963,7 +963,8 @@ Bộ lọc Đặt lại - Cho điểm + + Hạng từ Bất kỳ Tốt Rất tốt @@ -989,7 +990,6 @@ Đặt taxi Uber trực tiếp từ ứng dụng! Gọi taxi không khả dụng trong chế độ ngoại tuyến. Gọi taxi tạm thời không khả dụng. - Quảng cáo Sử dụng mạng Internet di động để hiển thị thông tin chi tiết? Luôn Sử dụng Chỉ Hôm nay @@ -1066,10 +1066,29 @@ Xem thêm đánh giá trên Booking.com Kết nối đến Internet để xem thêm thông tin về địa điểm này. Không thể tải thông tin. + Đang cập nhật bản đồ + Cập nhật các bản đồ đã tải về của bạn + Cập nhật bản đồ để cập nhật thông tin về các đối tượng trên đó + Cập nhật (%s) + Cập nhật thủ công sau Căn hộ Cắm trại Nhà vệ sinh công cộng Nhà khách Nhà trọ Khu nghỉ dưỡng + Khách sạn + Nhà nghỉ + Tôi là chủ doanh nghiệp này + Doanh nghiệp này được quảng cáo + Loại + + Phản hồi chung + Bật + Tắt + Chúng tôi sử dụng TTS hệ thống để hướng dẫn bằng giọng nói. Rất nhiều thiết bị Android sử dụng Google TTS, bạn có thể tải về hoặc cập nhật nó từ Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + Đối với tiếng Ả Rập, tiếng Hy Lạp và tiếng Rumani, bạn có thể cần cài đặt thêm TTS (bởi Google TTS chưa hỗ trợ các ngôn ngữ này) từ Google Play như Vocalizer TTS hoặc SVOX Classics.\nĐể quản lý các thiết lập tổng hợp giọng nói, trên thiết bị của bạn mở Cài đặt –> Ngôn ngữ và nhập liệu –> Giọng nói –> Đầu ra văn bản thành giọng nói. Ở đây bạn có thể tải về thêm các gói ngôn ngữ và lựa chọn công cụ chuyển văn bản thành giọng nói ưa thích. + Để biết thêm thông tin, vui lòng kiểm tra bài hướng dẫn này. + Chuyển ngữ sang chữ Latinh + Nếu một đường phố hoặc đối tượng không có tên trong ngôn ngữ của bạn, nó sẽ được đánh vần sử dụng bảng chữ cái alphabet. diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml index 4e7ad6e536..0cc66c59c4 100644 --- a/android/res/values-zh-rTW/strings.xml +++ b/android/res/values-zh-rTW/strings.xml @@ -392,8 +392,6 @@ 聯絡我們 意見反應 - - 一般意見反應 訂閱我們的新聞 @@ -975,7 +973,8 @@ 篩選條件 重設 - 評分 + + 評分下限 任意 好 很好 @@ -1001,7 +1000,6 @@ 直接從應用程序預訂計程車！ 叫計程車服務在離線模式下無法使用。 叫計程車服務暫時無法使用。 - 廣告 使用手機網路顯示詳細資訊？ 一律使用 僅限今天 @@ -1078,10 +1076,29 @@ Booking.com 上的更多評價 連上網路以取得關於地點的更多資訊。 無法載入資訊。 + 更新地圖 + 更新您下載的地圖 + 更新地圖以讓物件資訊保持在最新狀態 + 更新 (%s) + 稍後手動更新 公寓 露營 木屋 賓館 旅舍 度假酒店 + 飯店 + 汽車旅館 + 聲明這是你的公司 + 業務已發出廣告 + 類型 + + 一般反應 + 開 + 關 + 我們使用系統 TTS 提供語音指示。許多 Android 裝置使用 Google TTS，您可從 Google Play 下載或更新 (https://play.google.com/store/apps/details?id=com.google.android.tts) + 對於阿拉伯語、希臘語或羅馬尼亞語，必須從 Google Play 下載 Vocalizer TTS 或 SVOX Classics 等其他 TTS (因為 Google TTS 尚未支援這些語言)。\n若要管理語音合成的設定，請在您的裝置上開啟「設定 –> 語言和輸入 –> 語音 –> 文字轉語音輸出」。您可在此下載其他語言套件，或選擇偏好的文字轉語音引擎。 + 如需更多資訊，請參閱本指南。 + 音譯為拉丁文 + 若街道或物件沒有您語言的名稱，會使用拉丁字母拼出。 diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml index 3a49fbaac5..57342496c9 100644 --- a/android/res/values-zh/strings.xml +++ b/android/res/values-zh/strings.xml @@ -969,7 +969,8 @@ 筛选器 重置 - 评分 + + 最低评分 任意 好 很好 @@ -995,7 +996,6 @@ 从应用直接叫优步出租车！ 叫出租车服务在离线模式下无法使用。 叫出租车服务暂时无法使用。 - 广告 使用移动网络显示详细信息？ 始终使用 仅在今天 @@ -1072,10 +1072,29 @@ Booking.com 上的更多评价 连接到互联网来获取关于地点的更多信息。 无法加载信息。 + 正在更新地图 + 更新已下载的地图 + 更新地图可以让对象的信息保持最新状态 + 更新 (%s) + 稍后手动更新 公寓 露营 木屋 招待所์|์旅馆์|์旅社|旅店 旅馆 度假村 + 旅店 + 汽车旅馆 + 认领此商家 + 商家已推广 + 类型 + + 一般反馈 + 开 + 关 + 我们为语音指令使用“文字转语音”系统。许多 Android 设备使用 Google 文字转语音，您可以从 Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) 下载或更新这一功能 + 对于阿拉伯语、希腊语和罗马尼亚语，您需要从 Google Play 中安装其他“文字转语音”功能（因为 Google 文字转语音不支持这些语言），例如 Vocalizer TTS 或 SVOX Classics。\n要管理语音合成的设置，请在您的设备上打开“设置 –> 语言和输入法 –> 语音 –> 文字转语音 (TTS) 输出”。您可以从这里下载其他语言包或选择首先的文字转语音引擎。 + 如需了解更多信息，请查阅此指南。 + 直译成拉丁文 + 如果某条街道或者某个对象在您的语言中没有对应的名称，它将使用拉丁字母拼写。 diff --git a/android/res/values/arrays.xml b/android/res/values/arrays.xml index 2e7d198b00..946018fdfe 100644 --- a/android/res/values/arrays.xml +++ b/android/res/values/arrays.xml @@ -29,26 +29,32 @@ - @drawable/ic_wn_rich_page_hotel + @drawable/img_whatsnew_driving_style + @drawable/img_whatsnew_transliteration -s + - @string/whatsnew_more_info_on_hotels_title + @string/whatsnew_driving_style_title + @string/whatsnew_transliteration_title - @string/whatsnew_more_info_on_hotels_message + @string/whatsnew_driving_style_message + @string/whatsnew_transliteration_message + + + diff --git a/android/res/values/colors.xml b/android/res/values/colors.xml index eff844b771..44afeee8d2 100644 --- a/android/res/values/colors.xml +++ b/android/res/values/colors.xml @@ -21,12 +21,14 @@ #8A000000 #61000000 #14000000 + #1E000000 #3D000000 #99000000 #FFFFFFFF #B3FFFFFF #4CFFFFFF #14FFFFFF + #1EFFFFFF #1Effffff #3DFFFFFF #99FFFFFF @@ -99,7 +101,7 @@ @color/base_accent @color/base_accent_night #FF1C85D6 - #FFCCB870 + #FF3C9BBE #FFEFEFEF #FF505050 #FFFFFFFF diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml index 36061cf6d8..47dbcd4d5a 100644 --- a/android/res/values/dimens.xml +++ b/android/res/values/dimens.xml @@ -181,11 +181,11 @@ 20dp 80dp + + 32dp 128dp 20dp - - 8dp 72dp diff --git a/android/res/values/donottranslate.xml b/android/res/values/donottranslate.xml index 27348cf921..3d7c52b539 100644 --- a/android/res/values/donottranslate.xml +++ b/android/res/values/donottranslate.xml @@ -76,4 +76,6 @@ collapse height limited + + search_hotel_filter_%s diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index 0aeecb9ee6..746bce1972 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -306,11 +306,6 @@ General settings Information - - Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.). - - For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device\'s settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine. - For more information please check the guide. Map @@ -407,8 +402,6 @@ Contact us Feedback - - General Feedback Subscribe to our newsletter @@ -993,7 +986,8 @@ Filter Reset - Rating + + Rating from Any Good Very Good @@ -1019,7 +1013,8 @@ Order a taxi directly from the app! Taxi ordering is unavailable in offline mode. Taxi ordering is temporarily unavailable. - Advertisement + + AD Use mobile internet to show detailed information? Use Always Only Today @@ -1104,7 +1099,7 @@ Booking.com Updating maps Update your downloaded maps - Update maps supports information about objects in the current state + Updating maps keeps the information about objects up to date Update (%s) Manually update later Apartments @@ -1113,9 +1108,18 @@ Guest House Hostel Resort + Hotel Motel - Create ad campaign - View ad campaign + Claim this business + Business is advertised + Type + + General Feedback On Off + We use system TTS for voice instructions. Many Android devices use Google TTS, you can download or update it from Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + For Arabic, Greek and Romanian languages you may need to install additional TTS (as Google TTS doesn’t support the languages yet) from Google Play like Vocalizer TTS or SVOX Classics.\nTo manage settings for speech synthesis, on your device open Settings –> Language and input –> Speech –> Text to speech output. Here you can download additional language pack or select preferred text-to-speech engine. + For more information please check this guide. + Transliteration into Latin + If a street or an object doesn\'t have a name in your language, it will be spelt using the Latin alphabet. diff --git a/android/res/values/themes-attrs.xml b/android/res/values/themes-attrs.xml index 538b508d1d..4c1bc0897a 100644 --- a/android/res/values/themes-attrs.xml +++ b/android/res/values/themes-attrs.xml @@ -40,6 +40,7 @@ + @@ -84,6 +85,8 @@ + + diff --git a/android/res/values/themes-base.xml b/android/res/values/themes-base.xml index e805959318..53947105fd 100644 --- a/android/res/values/themes-base.xml +++ b/android/res/values/themes-base.xml @@ -51,6 +51,7 @@ @color/base_accent @drawable/button_accent + @drawable/button_accent_round @color/button_accent_text @color/button_accent_text_disabled @@ -101,6 +102,8 @@ @color/search_local_ads_customer_result @style/PreferenceThemeOverlay.v14.Material + + @drawable/bg_tag @@ -155,6 +158,7 @@ @color/base_accent_night @drawable/button_accent_night + @drawable/button_accent_round_night @color/button_accent_text_night @color/button_accent_text_disabled_night @@ -204,6 +208,7 @@ @color/warm_gray_night @color/search_local_ads_customer_result_night - @style/PreferenceThemeOverlay.v14.Material + + @drawable/bg_tag_night diff --git a/android/src/com/mapswithme/maps/DownloadResourcesActivity.java b/android/src/com/mapswithme/maps/DownloadResourcesActivity.java index f23745a5c9..cfa9ab7784 100644 --- a/android/src/com/mapswithme/maps/DownloadResourcesActivity.java +++ b/android/src/com/mapswithme/maps/DownloadResourcesActivity.java @@ -100,6 +100,7 @@ public class DownloadResourcesActivity extends BaseMwmFragmentActivity new Ge0IntentProcessor(), new MapsWithMeIntentProcessor(), new GoogleMapsIntentProcessor(), + new LeadUrlIntentProcessor(), new OpenCountryTaskProcessor(), new KmzKmlProcessor() }; @@ -619,6 +620,35 @@ public class DownloadResourcesActivity extends BaseMwmFragmentActivity } } + private class LeadUrlIntentProcessor implements IntentProcessor + { + @Override + public boolean isSupported(Intent intent) + { + final Uri data = intent.getData(); + + if (data == null) + return false; + + String scheme = intent.getScheme(); + String host = data.getHost(); + if (TextUtils.isEmpty(scheme) || TextUtils.isEmpty(host)) + return false; + + return (scheme.equals("mapsme") || scheme.equals("mapswithme")) && "lead".equals(host); + } + + @Override + public boolean process(Intent intent) + { + final String url = intent.getData().toString(); + LOGGER.i(TAG, "URL = " + url); + mMapTaskToForward = new OpenUrlTask(url); + org.alohalytics.Statistics.logEvent("LeadUrlIntentProcessor::process", url); + return true; + } + } + private class OpenCountryTaskProcessor implements IntentProcessor { @Override diff --git a/android/src/com/mapswithme/maps/Framework.java b/android/src/com/mapswithme/maps/Framework.java index 4c3c77bd1e..d5b964df42 100644 --- a/android/src/com/mapswithme/maps/Framework.java +++ b/android/src/com/mapswithme/maps/Framework.java @@ -1,17 +1,20 @@ package com.mapswithme.maps; import android.graphics.Bitmap; +import android.location.Location; import android.support.annotation.IntDef; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.Size; import android.support.annotation.UiThread; +import com.mapswithme.maps.ads.LocalAdInfo; import com.mapswithme.maps.api.ParsedRoutingData; import com.mapswithme.maps.api.ParsedSearchRequest; import com.mapswithme.maps.api.ParsedUrlMwmRequest; import com.mapswithme.maps.bookmarks.data.DistanceAndAzimut; import com.mapswithme.maps.bookmarks.data.MapObject; +import com.mapswithme.maps.location.LocationHelper; import com.mapswithme.maps.routing.RoutingInfo; import com.mapswithme.util.Constants; @@ -54,6 +57,16 @@ public class Framework public static final int DO_AFTER_UPDATE_ASK_FOR_UPDATE = 2; public static final int DO_AFTER_UPDATE_MIGRATE = 3; + @Retention(RetentionPolicy.SOURCE) + @IntDef({LOCAL_ADS_EVENT_SHOW_POINT, LOCAL_ADS_EVENT_OPEN_INFO, LOCAL_ADS_EVENT_CLICKED_PHONE, + LOCAL_ADS_EVENT_CLICKED_WEBSITE}) + public @interface LocalAdsEventType {} + + public static final int LOCAL_ADS_EVENT_SHOW_POINT = 0; + public static final int LOCAL_ADS_EVENT_OPEN_INFO = 1; + public static final int LOCAL_ADS_EVENT_CLICKED_PHONE = 2; + public static final int LOCAL_ADS_EVENT_CLICKED_WEBSITE = 3; + @SuppressWarnings("unused") public interface MapObjectListener { @@ -116,6 +129,20 @@ public class Framework return Bitmap.createBitmap(altitudeChartBits, width, height, Bitmap.Config.ARGB_8888); } + public static void logLocalAdsEvent(@Framework.LocalAdsEventType int type, + @NonNull MapObject mapObject) + { + LocalAdInfo info = mapObject.getLocalAdInfo(); + if (info == null || !info.isCustomer()) + return; + + Location location = LocationHelper.INSTANCE.getLastKnownLocation(); + double lat = location != null ? location.getLatitude() : 0; + double lon = location != null ? location.getLongitude() : 0; + int accuracy = location != null ? (int) location.getAccuracy() : 0; + nativeLogLocalAdsEvent(type, lat, lon, accuracy); + } + public static native void nativeShowTrackRect(int category, int track); public static native int nativeGetDrawScale(); @@ -295,4 +322,7 @@ public class Framework // Navigation. public static native boolean nativeIsRouteFinished(); + + private static native void nativeLogLocalAdsEvent(@LocalAdsEventType int eventType, + double lat, double lon, int accuracy); } diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java index 0e2dd7eef4..21aa3bf1c5 100644 --- a/android/src/com/mapswithme/maps/MwmActivity.java +++ b/android/src/com/mapswithme/maps/MwmActivity.java @@ -1100,6 +1100,7 @@ public class MwmActivity extends BaseMwmFragmentActivity TrafficManager.INSTANCE.attach(mTrafficButtonController); if (mNavigationController != null) TrafficManager.INSTANCE.attach(mNavigationController); + mPlacePage.onActivityStarted(); } @Override @@ -1111,6 +1112,7 @@ public class MwmActivity extends BaseMwmFragmentActivity TrafficManager.INSTANCE.detachAll(); if (mTrafficButtonController != null) mTrafficButtonController.destroy(); + mPlacePage.onActivityStopped(); } @Override @@ -1203,7 +1205,7 @@ public class MwmActivity extends BaseMwmFragmentActivity } @Override - public void onMapObjectActivated(MapObject object) + public void onMapObjectActivated(final MapObject object) { if (MapObject.isOfType(MapObject.API_POINT, object)) { @@ -1225,7 +1227,11 @@ public class MwmActivity extends BaseMwmFragmentActivity public void onSetMapObjectComplete() { if (!mPlacePageRestored) + { mPlacePage.setState(State.PREVIEW); + if (object != null) + Framework.logLocalAdsEvent(Framework.LOCAL_ADS_EVENT_OPEN_INFO, object); + } mPlacePageRestored = false; } }); @@ -1438,14 +1444,18 @@ public class MwmActivity extends BaseMwmFragmentActivity RoutingController.get().setRouterType(data.mRouterType); final RoutePoint from = data.mPoints[0]; final RoutePoint to = data.mPoints[1]; - RoutingController.get().prepare(new MapObject(MapObject.API_POINT, from.mName, "", "", "", - from.mLat, from.mLon, "", null, false, "", null), - new MapObject(MapObject.API_POINT, to.mName, "", "", "", - to.mLat, to.mLon, "", null, false, "", null)); + RoutingController.get().prepare(new MapObject("", 0L, 0, MapObject.API_POINT, from.mName, + "", "", "", from.mLat, from.mLon, "", null, + false, "", null), + new MapObject("", 0L, 0, MapObject.API_POINT, to.mName, "", + "", "", to.mLat, to.mLon, "", null, false, "", + null)); return true; case ParsedUrlMwmRequest.RESULT_SEARCH: final ParsedSearchRequest request = Framework.nativeGetParsedSearchRequest(); return true; + case ParsedUrlMwmRequest.RESULT_LEAD: + return true; } return false; @@ -1551,7 +1561,7 @@ public class MwmActivity extends BaseMwmFragmentActivity if (controller.isBuilt() || controller.isUberRequestHandled()) { - mMainMenu.showLineFrame(true, new Runnable() + showLineFrame(true, new Runnable() { @Override public void run() @@ -1567,7 +1577,7 @@ public class MwmActivity extends BaseMwmFragmentActivity if (controller.isPlanning() || controller.isBuilding() || controller.isErrorEncountered()) { - mMainMenu.showLineFrame(false, new Runnable() + showLineFrame(false, new Runnable() { @Override public void run() @@ -1578,10 +1588,11 @@ public class MwmActivity extends BaseMwmFragmentActivity completion.run(); } }); + return; } - mMainMenu.showLineFrame(true, new Runnable() + showLineFrame(true, new Runnable() { @Override public void run() @@ -1594,6 +1605,17 @@ public class MwmActivity extends BaseMwmFragmentActivity completion.run(); } + private void showLineFrame(boolean show, @Nullable Runnable completion) + { + mMainMenu.showLineFrame(show, completion); + if (mIsFragmentContainer) + { + RoutingPlanFragment fragment = (RoutingPlanFragment) getFragment(RoutingPlanFragment.class); + if (fragment != null) + fragment.showStartButton(show); + } + } + private void setNavButtonsTopLimit(int limit) { if (mNavAnimationController == null) @@ -1688,7 +1710,8 @@ public class MwmActivity extends BaseMwmFragmentActivity setNavButtonsTopLimit(visible ? toolbarHeight : 0); if (mFilterController != null) { - boolean show = visible && !TextUtils.isEmpty(SearchEngine.getQuery()); + boolean show = visible && !TextUtils.isEmpty(SearchEngine.getQuery()) + && !RoutingController.get().isNavigating(); mFilterController.show(show, true); mMainMenu.show(!show); } @@ -1717,6 +1740,13 @@ public class MwmActivity extends BaseMwmFragmentActivity if (mOnmapDownloader != null) mOnmapDownloader.updateState(false); adjustCompass(UiUtils.getCompassYOffset(this)); + if (show) + { + mSearchController.clear(); + mSearchController.hide(); + if (mFilterController != null) + mFilterController.show(false, true); + } } @Override diff --git a/android/src/com/mapswithme/maps/ads/BaseNativeAdLoader.java b/android/src/com/mapswithme/maps/ads/BaseNativeAdLoader.java index daaef96f7a..b4cce62121 100644 --- a/android/src/com/mapswithme/maps/ads/BaseNativeAdLoader.java +++ b/android/src/com/mapswithme/maps/ads/BaseNativeAdLoader.java @@ -1,5 +1,6 @@ package com.mapswithme.maps.ads; +import android.support.annotation.CallSuper; import android.support.annotation.Nullable; abstract class BaseNativeAdLoader implements NativeAdLoader @@ -18,4 +19,11 @@ abstract class BaseNativeAdLoader implements NativeAdLoader { return mAdListener; } + + @CallSuper + @Override + public void cancel() + { + setAdListener(null); + } } diff --git a/android/src/com/mapswithme/maps/ads/CachedMwmNativeAd.java b/android/src/com/mapswithme/maps/ads/CachedMwmNativeAd.java index 1778247924..0730aebd88 100644 --- a/android/src/com/mapswithme/maps/ads/CachedMwmNativeAd.java +++ b/android/src/com/mapswithme/maps/ads/CachedMwmNativeAd.java @@ -1,5 +1,7 @@ package com.mapswithme.maps.ads; +import android.support.annotation.NonNull; + abstract class CachedMwmNativeAd extends BaseMwmNativeAd { private final long mLoadedTime; @@ -13,4 +15,8 @@ abstract class CachedMwmNativeAd extends BaseMwmNativeAd { return mLoadedTime; } + + abstract void detachAdListener(); + + abstract void attachAdListener(@NonNull Object listener); } diff --git a/android/src/com/mapswithme/maps/ads/CachingNativeAdLoader.java b/android/src/com/mapswithme/maps/ads/CachingNativeAdLoader.java index eaa54b5f5a..885809fe1c 100644 --- a/android/src/com/mapswithme/maps/ads/CachingNativeAdLoader.java +++ b/android/src/com/mapswithme/maps/ads/CachingNativeAdLoader.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.ads; import android.content.Context; import android.os.SystemClock; +import android.support.annotation.CallSuper; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -45,6 +46,7 @@ abstract class CachingNativeAdLoader extends BaseNativeAdLoader * */ @Override + @CallSuper public void loadAd(@NonNull Context context, @NonNull String bannerId) { LOGGER.d(TAG, "Load the ad for a banner id '" + bannerId + "'"); @@ -71,6 +73,14 @@ abstract class CachingNativeAdLoader extends BaseNativeAdLoader } } + @CallSuper + @Override + public void cancel() + { + super.cancel(); + PENDING_REQUESTS.clear(); + } + private boolean isImpressionGood(@NonNull CachedMwmNativeAd ad) { return mTracker != null && mTracker.isImpressionGood(ad.getProvider(), ad.getBannerId()); @@ -170,4 +180,23 @@ abstract class CachingNativeAdLoader extends BaseNativeAdLoader { return getAdByIdFromCache(key) == null; } + + @CallSuper + @Override + public void detach() + { + for (CachedMwmNativeAd ad : CACHE.values()) + ad.detachAdListener(); + } + + @CallSuper + @Override + public void attach() + { + for (CachedMwmNativeAd ad : CACHE.values()) + { + if (ad.getProvider().equals(getProvider())) + ad.attachAdListener(this); + } + } } diff --git a/android/src/com/mapswithme/maps/ads/CompoundNativeAdLoader.java b/android/src/com/mapswithme/maps/ads/CompoundNativeAdLoader.java index edc21671cc..8517f2fd76 100644 --- a/android/src/com/mapswithme/maps/ads/CompoundNativeAdLoader.java +++ b/android/src/com/mapswithme/maps/ads/CompoundNativeAdLoader.java @@ -1,5 +1,6 @@ package com.mapswithme.maps.ads; +import android.annotation.SuppressLint; import android.content.Context; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -55,7 +56,8 @@ public class CompoundNativeAdLoader extends BaseNativeAdLoader implements Native public void loadAd(@NonNull Context context, @NonNull List banners) { LOGGER.i(TAG, "Load ads for " + banners); - cancelLoaders(); + detach(); + cancel(); mLoadingCompleted = false; mFailedProviders.clear(); @@ -69,6 +71,7 @@ public class CompoundNativeAdLoader extends BaseNativeAdLoader implements Native NativeAdLoader loader = Factory.createLoaderForBanner(banner, mCacheListener, mAdTracker); mLoaders.add(loader); + attach(); loader.setAdListener(this); loader.loadAd(context, banner.getId()); } @@ -86,6 +89,31 @@ public class CompoundNativeAdLoader extends BaseNativeAdLoader implements Native throw new UnsupportedOperationException("A compound loader doesn't support this operation!"); } + @SuppressLint("MissingSuperCall") + // Don't need to call super here, because we don't need to null the mAdListener from the + // CompoundNativeAdLoader + @Override + public void cancel() + { + for (NativeAdLoader loader : mLoaders) + loader.cancel(); + mLoaders.clear(); + } + + @Override + public void detach() + { + for (NativeAdLoader loader : mLoaders) + loader.detach(); + } + + @Override + public void attach() + { + for (NativeAdLoader loader : mLoaders) + loader.attach(); + } + public boolean isAdLoading() { return !mLoadingCompleted; @@ -169,13 +197,6 @@ public class CompoundNativeAdLoader extends BaseNativeAdLoader implements Native mLoadingCompleted = true; } - private void cancelLoaders() - { - for (NativeAdLoader adLoader : mLoaders) - adLoader.setAdListener(null); - mLoaders.clear(); - } - private class DelayedNotification implements Runnable { @NonNull diff --git a/android/src/com/mapswithme/maps/ads/FacebookNativeAd.java b/android/src/com/mapswithme/maps/ads/FacebookNativeAd.java index 318dd9bced..5c765f95e0 100644 --- a/android/src/com/mapswithme/maps/ads/FacebookNativeAd.java +++ b/android/src/com/mapswithme/maps/ads/FacebookNativeAd.java @@ -5,6 +5,7 @@ import android.support.annotation.Nullable; import android.view.View; import android.widget.ImageView; +import com.facebook.ads.AdListener; import com.facebook.ads.NativeAd; class FacebookNativeAd extends CachedMwmNativeAd @@ -83,4 +84,19 @@ class FacebookNativeAd extends CachedMwmNativeAd { return mAd.getAdChoicesLinkUrl(); } + + @Override + void detachAdListener() + { + mAd.setAdListener(null); + } + + @Override + void attachAdListener(@NonNull Object listener) + { + if (!(listener instanceof AdListener)) + throw new AssertionError("A listener for Facebook ad must be instance of " + + "AdListener class! Not '" + listener.getClass() + "'!"); + mAd.setAdListener((AdListener) listener); + } } diff --git a/android/src/com/mapswithme/maps/ads/MopubNativeAd.java b/android/src/com/mapswithme/maps/ads/MopubNativeAd.java index ebe8eb355d..d69bbc5180 100644 --- a/android/src/com/mapswithme/maps/ads/MopubNativeAd.java +++ b/android/src/com/mapswithme/maps/ads/MopubNativeAd.java @@ -6,6 +6,7 @@ import android.text.TextUtils; import android.view.View; import android.widget.ImageView; +import com.mopub.nativeads.BaseNativeAd; import com.mopub.nativeads.NativeAd; import com.mopub.nativeads.NativeImageHelper; import com.mopub.nativeads.StaticNativeAd; @@ -82,4 +83,20 @@ class MopubNativeAd extends CachedMwmNativeAd { return mAd.getPrivacyInformationIconClickThroughUrl(); } + + @Override + void detachAdListener() + { + mAd.setNativeEventListener(null); + } + + @Override + void attachAdListener(@NonNull Object listener) + { + if (!(listener instanceof BaseNativeAd.NativeEventListener)) + throw new AssertionError("A listener for MoPub ad must be instance of " + + "NativeAd.MoPubNativeEventListener class! Not '" + + listener.getClass() + "'!"); + mAd.setNativeEventListener((BaseNativeAd.NativeEventListener) listener); + } } diff --git a/android/src/com/mapswithme/maps/ads/MopubNativeDownloader.java b/android/src/com/mapswithme/maps/ads/MopubNativeDownloader.java index 84386e120c..b34aeefdb5 100644 --- a/android/src/com/mapswithme/maps/ads/MopubNativeDownloader.java +++ b/android/src/com/mapswithme/maps/ads/MopubNativeDownloader.java @@ -5,6 +5,7 @@ import android.location.Location; import android.os.SystemClock; import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; @@ -21,7 +22,8 @@ import com.mopub.nativeads.StaticNativeAd; import java.util.EnumSet; -class MopubNativeDownloader extends CachingNativeAdLoader implements MoPubNative.MoPubNativeNetworkListener +class MopubNativeDownloader extends CachingNativeAdLoader + implements MoPubNative.MoPubNativeNetworkListener, BaseNativeAd.NativeEventListener { private final static Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC); private final static String TAG = MopubNativeDownloader.class.getSimpleName(); @@ -34,6 +36,13 @@ class MopubNativeDownloader extends CachingNativeAdLoader implements MoPubNative super(tracker, listener); } + @Override + public void loadAd(@NonNull Context context, @NonNull String bannerId) + { + mBannerId = bannerId; + super.loadAd(context, bannerId); + } + @Override void loadAdFromProvider(@NonNull Context context, @NonNull String bannerId) { @@ -55,7 +64,6 @@ class MopubNativeDownloader extends CachingNativeAdLoader implements MoPubNative requestParameters.desiredAssets(assetsSet); nativeAd.makeRequest(requestParameters.build()); - mBannerId = bannerId; } @NonNull @@ -66,8 +74,9 @@ class MopubNativeDownloader extends CachingNativeAdLoader implements MoPubNative } @Override - public void onNativeLoad(NativeAd nativeAd) + public void onNativeLoad(final NativeAd nativeAd) { + nativeAd.getBaseNativeAd().setNativeEventListener(this); LOGGER.d(TAG, "onNativeLoad nativeAd = " + nativeAd); CachedMwmNativeAd ad = new MopubNativeAd(nativeAd, SystemClock.elapsedRealtime()); onAdLoaded(nativeAd.getAdUnitId(), ad); @@ -83,6 +92,19 @@ class MopubNativeDownloader extends CachingNativeAdLoader implements MoPubNative onError(mBannerId, getProvider(), new MopubAdError(errorCode.toString())); } + @Override + public void onAdImpressed() + { + // No op. + } + + @Override + public void onAdClicked() + { + if (!TextUtils.isEmpty(mBannerId)) + onAdClicked(mBannerId); + } + private static class DummyRenderer implements MoPubAdRenderer { @@ -90,7 +112,7 @@ class MopubNativeDownloader extends CachingNativeAdLoader implements MoPubNative @Override public View createAdView(@NonNull Context context, @Nullable ViewGroup parent) { - // This method is never called, don't worry about nullness warning + // This method is never called, don't worry about nullness warning. // noinspection ConstantConditions return null; } @@ -98,7 +120,7 @@ class MopubNativeDownloader extends CachingNativeAdLoader implements MoPubNative @Override public void renderAdView(@NonNull View view, @NonNull StaticNativeAd ad) { - // no op + // No op. } @Override diff --git a/android/src/com/mapswithme/maps/ads/MyTargetNativeAd.java b/android/src/com/mapswithme/maps/ads/MyTargetNativeAd.java index 10f81e6050..6a94af7beb 100644 --- a/android/src/com/mapswithme/maps/ads/MyTargetNativeAd.java +++ b/android/src/com/mapswithme/maps/ads/MyTargetNativeAd.java @@ -90,4 +90,19 @@ class MyTargetNativeAd extends CachedMwmNativeAd { return null; } + + @Override + void detachAdListener() + { + mAd.setListener(null); + } + + @Override + void attachAdListener(@NonNull Object listener) + { + if (!(listener instanceof NativeAd.NativeAdListener)) + throw new AssertionError("A listener for myTarget ad must be instance of " + + "NativeAd.NativeAdListener class! Not '" + listener.getClass() + "'!"); + mAd.setListener((NativeAd.NativeAdListener) listener); + } } diff --git a/android/src/com/mapswithme/maps/ads/NativeAdLoader.java b/android/src/com/mapswithme/maps/ads/NativeAdLoader.java index c7783849d5..6af86636ab 100644 --- a/android/src/com/mapswithme/maps/ads/NativeAdLoader.java +++ b/android/src/com/mapswithme/maps/ads/NativeAdLoader.java @@ -4,7 +4,7 @@ import android.content.Context; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -public interface NativeAdLoader +interface NativeAdLoader { /** * Loads an ad for the specified banner id. A caller will be notified about loading through @@ -29,4 +29,21 @@ public interface NativeAdLoader * @return true if loading is in a progress, otherwise - false. */ boolean isAdLoading(@NonNull String bannerId); + + /** + * Cancels the loading process. + * + */ + void cancel(); + + /** + * Detaches this loader from UI context. Must be called every time when current UI context is going + * to be destroyed. Otherwise, memory leaks are possible. + */ + void detach(); + + /** + * Attaches this loader to UI context. + */ + void attach(); } diff --git a/android/src/com/mapswithme/maps/api/ParsedUrlMwmRequest.java b/android/src/com/mapswithme/maps/api/ParsedUrlMwmRequest.java index 1d3574bd15..fe4556571a 100644 --- a/android/src/com/mapswithme/maps/api/ParsedUrlMwmRequest.java +++ b/android/src/com/mapswithme/maps/api/ParsedUrlMwmRequest.java @@ -11,13 +11,14 @@ import java.lang.annotation.RetentionPolicy; public class ParsedUrlMwmRequest { @Retention(RetentionPolicy.SOURCE) - @IntDef({RESULT_INCORRECT, RESULT_MAP, RESULT_ROUTE, RESULT_SEARCH}) + @IntDef({RESULT_INCORRECT, RESULT_MAP, RESULT_ROUTE, RESULT_SEARCH, RESULT_LEAD}) public @interface ParsingResult {} public static final int RESULT_INCORRECT = 0; public static final int RESULT_MAP = 1; public static final int RESULT_ROUTE = 2; public static final int RESULT_SEARCH = 3; + public static final int RESULT_LEAD = 4; public final RoutePoint[] mRoutePoints; public final String mGlobalUrl; diff --git a/android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java b/android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java index 9343e432c2..53baafb886 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java @@ -24,12 +24,13 @@ public class Bookmark extends MapObject @Nullable private final String mObjectTitle; - Bookmark(@IntRange(from = 0) int categoryId, @IntRange(from = 0) int bookmarkId, String title, + Bookmark(@NonNull String mwmName, long mwmVersion, int featureIndex, + @IntRange(from = 0) int categoryId, @IntRange(from = 0) int bookmarkId, String title, @Nullable String secondaryTitle, @Nullable String objectTitle, @Nullable Banner[] banners, boolean reachableByTaxi, @Nullable String bookingSearchUrl, @Nullable LocalAdInfo localAdInfo) { - super(BOOKMARK, title, secondaryTitle, "", "", 0, 0, "", banners, reachableByTaxi, - bookingSearchUrl, localAdInfo); + super(mwmName, mwmVersion, featureIndex, BOOKMARK, title, secondaryTitle, "", "", 0, 0, "", + banners, reachableByTaxi, bookingSearchUrl, localAdInfo); mCategoryId = categoryId; mBookmarkId = bookmarkId; @@ -57,9 +58,9 @@ public class Bookmark extends MapObject dest.writeString(mObjectTitle); } - protected Bookmark(Parcel source) + protected Bookmark(@MapObjectType int type, Parcel source) { - super(source); + super(type, source); mCategoryId = source.readInt(); mBookmarkId = source.readInt(); mIcon = getIconInternal(); diff --git a/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java b/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java index 5d7c986422..3d683f0498 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java @@ -30,6 +30,10 @@ public class MapObject implements Parcelable public static final int MY_POSITION = 3; public static final int SEARCH = 4; + @NonNull + private final String mMwmName; + private final long mMwmVersion; + private final int mFeatureIndex; @MapObjectType private final int mMapObjectType; @@ -50,20 +54,25 @@ public class MapObject implements Parcelable @Nullable private LocalAdInfo mLocalAdInfo; - public MapObject(@MapObjectType int mapObjectType, String title, @Nullable String secondaryTitle, + public MapObject(@NonNull String mwmName, long mwmVersion, int featureIndex, + @MapObjectType int mapObjectType, String title, @Nullable String secondaryTitle, String subtitle, String address, double lat, double lon, String apiId, @Nullable Banner[] banners, boolean reachableByTaxi, @Nullable String bookingSearchUrl, @Nullable LocalAdInfo localAdInfo) { - this(mapObjectType, title, secondaryTitle, subtitle, address, lat, lon, new Metadata(), - apiId, banners, reachableByTaxi, bookingSearchUrl, localAdInfo); + this(mwmName, mwmVersion, featureIndex, mapObjectType, title, secondaryTitle, subtitle, address, + lat, lon, new Metadata(), apiId, banners, reachableByTaxi, bookingSearchUrl, localAdInfo); } - public MapObject(@MapObjectType int mapObjectType, String title, @Nullable String secondaryTitle, + public MapObject(@NonNull String mwmName, long mwmVersion, int featureIndex, + @MapObjectType int mapObjectType, String title, @Nullable String secondaryTitle, String subtitle, String address, double lat, double lon, Metadata metadata, String apiId, @Nullable Banner[] banners, boolean reachableByTaxi, @Nullable String bookingSearchUrl, @Nullable LocalAdInfo localAdInfo) { + mMwmName = mwmName; + mMwmVersion = mwmVersion; + mFeatureIndex = featureIndex; mMapObjectType = mapObjectType; mTitle = title; mSecondaryTitle = secondaryTitle; @@ -80,10 +89,13 @@ public class MapObject implements Parcelable mBanners = new ArrayList<>(Arrays.asList(banners)); } - protected MapObject(Parcel source) + protected MapObject(@MapObjectType int type, Parcel source) { //noinspection ResourceType - this(source.readInt(), // MapObjectType + this(source.readString(), // MwmName + source.readLong(), // MwmVersion + source.readInt(), // FeatureId + type, // MapObjectType source.readString(), // Title source.readString(), // SecondaryTitle source.readString(), // Subtitle @@ -236,13 +248,29 @@ public class MapObject implements Parcelable return mLocalAdInfo; } + @NonNull + public String getMwmName() + { + return mMwmName; + } + + public long getMwmVersion() + { + return mMwmVersion; + } + + public int getFeatureIndex() + { + return mFeatureIndex; + } + private static MapObject readFromParcel(Parcel source) { @MapObjectType int type = source.readInt(); if (type == BOOKMARK) - return new Bookmark(source); + return new Bookmark(type, source); - return new MapObject(source); + return new MapObject(type, source); } @Override @@ -254,8 +282,12 @@ public class MapObject implements Parcelable @Override public void writeToParcel(Parcel dest, int flags) { - dest.writeInt(mMapObjectType); // write map object type twice - first int is used to distinguish created object (MapObject or Bookmark) + // A map object type must be written first, since it's used in readParcel method to distinguish + // what type of object should be read from the parcel. dest.writeInt(mMapObjectType); + dest.writeString(mMwmName); + dest.writeLong(mMwmVersion); + dest.writeInt(mFeatureIndex); dest.writeString(mTitle); dest.writeString(mSecondaryTitle); dest.writeString(mSubtitle); diff --git a/android/src/com/mapswithme/maps/downloader/UpdaterDialogFragment.java b/android/src/com/mapswithme/maps/downloader/UpdaterDialogFragment.java index f0ce8ba511..7782b7f359 100644 --- a/android/src/com/mapswithme/maps/downloader/UpdaterDialogFragment.java +++ b/android/src/com/mapswithme/maps/downloader/UpdaterDialogFragment.java @@ -96,8 +96,7 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment else { // TODO remove attachMap() when dialog migrated to SplashActivity - attachMap(); - dismiss(); + finish(); } } }); @@ -110,8 +109,7 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment return; // TODO remove attachMap() when dialog migrated to SplashActivity - attachMap(); - dismiss(); + finish(); } @Override @@ -126,6 +124,13 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment } }; + private void finish() + { + attachMap(); + updateActivityMenu(); + dismiss(); + } + @NonNull private final View.OnClickListener mCancelClickListener = new View.OnClickListener() { @@ -141,8 +146,7 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment MapManager.nativeCancel(CountryItem.getRootId()); // TODO remove attachMap() when dialog migrated to SplashActivity - attachMap(); - dismiss(); + finish(); } }; @@ -247,8 +251,7 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment if (isAllUpdated()) { // TODO remove attachMap() when dialog migrated to SplashActivity - attachMap(); - dismiss(); + finish(); return; } @@ -290,10 +293,19 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment // TODO remove attachMap() when dialog migrated to SplashActivity attachMap(); + updateActivityMenu(); super.onCancel(dialog); } -//TODO remove attachMap() when dialog migrated to SplashActivity + private void updateActivityMenu() + { + if (!(getActivity() instanceof MwmActivity)) + return; + + ((MwmActivity)getActivity()).getMainMenu().onResume(null); + } + + //TODO remove attachMap() when dialog migrated to SplashActivity private void attachMap() { if (!(getActivity() instanceof MwmActivity)) diff --git a/android/src/com/mapswithme/maps/editor/Editor.java b/android/src/com/mapswithme/maps/editor/Editor.java index 715f1d381a..044d21060e 100644 --- a/android/src/com/mapswithme/maps/editor/Editor.java +++ b/android/src/com/mapswithme/maps/editor/Editor.java @@ -100,6 +100,7 @@ public final class Editor public static native boolean nativeIsAddressEditable(); public static native boolean nativeIsNameEditable(); + public static native boolean nativeIsPointType(); public static native boolean nativeIsBuilding(); public static native NamesDataSource nativeGetNamesDataSource(boolean needFakes); diff --git a/android/src/com/mapswithme/maps/editor/EditorFragment.java b/android/src/com/mapswithme/maps/editor/EditorFragment.java index c30dc341ab..4ef7d49d8a 100644 --- a/android/src/com/mapswithme/maps/editor/EditorFragment.java +++ b/android/src/com/mapswithme/maps/editor/EditorFragment.java @@ -287,7 +287,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe { UiUtils.showIf(Editor.nativeIsNameEditable(), mCardName); UiUtils.showIf(Editor.nativeIsAddressEditable(), mCardAddress); - UiUtils.showIf(Editor.nativeIsBuilding(), mBlockLevels); + UiUtils.showIf(Editor.nativeIsBuilding() && !Editor.nativeIsPointType(), mBlockLevels); final int[] editableMeta = Editor.nativeGetEditableFields(); if (editableMeta.length == 0) diff --git a/android/src/com/mapswithme/maps/editor/EditorHostFragment.java b/android/src/com/mapswithme/maps/editor/EditorHostFragment.java index 43c97abca0..d5ce63cbeb 100644 --- a/android/src/com/mapswithme/maps/editor/EditorHostFragment.java +++ b/android/src/com/mapswithme/maps/editor/EditorHostFragment.java @@ -10,6 +10,7 @@ import android.support.annotation.Nullable; import android.support.annotation.StringRes; import android.support.v4.app.Fragment; import android.support.v7.app.AlertDialog; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -291,10 +292,14 @@ public class EditorHostFragment extends BaseMwmToolbarFragment // Save object edits if (!MwmApplication.prefs().contains(NOOB_ALERT_SHOWN)) + { showNoobDialog(); + } else + { + saveNote(); saveMapObjectEdits(); - + } break; } } @@ -328,6 +333,15 @@ public class EditorHostFragment extends BaseMwmToolbarFragment } } + private void saveNote() + { + String tag = EditorFragment.class.getName(); + EditorFragment fragment = (EditorFragment) getChildFragmentManager().findFragmentByTag(tag); + String note = fragment.getDescription(); + if (!TextUtils.isEmpty(note)) + Editor.nativeCreateNote(note); + } + private void showMistakeDialog(@StringRes int resId) { new AlertDialog.Builder(getActivity()) @@ -350,11 +364,7 @@ public class EditorHostFragment extends BaseMwmToolbarFragment MwmApplication.prefs().edit() .putBoolean(NOOB_ALERT_SHOWN, true) .apply(); - // Save note - final String note = ((EditorFragment) getChildFragmentManager().findFragmentByTag(EditorFragment.class.getName())).getDescription(); - if (note.length() != 0) - Editor.nativeCreateNote(note); - // Save edits + saveNote(); saveMapObjectEdits(); } }) diff --git a/android/src/com/mapswithme/maps/gallery/GalleryFragment.java b/android/src/com/mapswithme/maps/gallery/GalleryFragment.java index c1c02c8f5d..dbfae12720 100644 --- a/android/src/com/mapswithme/maps/gallery/GalleryFragment.java +++ b/android/src/com/mapswithme/maps/gallery/GalleryFragment.java @@ -43,7 +43,7 @@ public class GalleryFragment extends BaseMwmFragment implements RecyclerClickLis RecyclerView rvGallery = (RecyclerView) view.findViewById(R.id.rv__gallery); rvGallery.setLayoutManager(new GridLayoutManager(getContext(), NUM_COLUMNS)); rvGallery.setAdapter(new ImageAdapter(mImages, this)); - Drawable divider = ContextCompat.getDrawable(getContext(), R.drawable.divider_transparent); + Drawable divider = ContextCompat.getDrawable(getContext(), R.drawable.divider_transparent_quarter); rvGallery.addItemDecoration(new GridDividerItemDecoration(divider, divider, NUM_COLUMNS)); } } diff --git a/android/src/com/mapswithme/maps/location/LocationHelper.java b/android/src/com/mapswithme/maps/location/LocationHelper.java index a8cb82556b..9594b6ea8e 100644 --- a/android/src/com/mapswithme/maps/location/LocationHelper.java +++ b/android/src/com/mapswithme/maps/location/LocationHelper.java @@ -214,8 +214,9 @@ public enum LocationHelper return null; if (mMyPosition == null) - mMyPosition = new MapObject(MapObject.MY_POSITION, "", "", "", "", mSavedLocation.getLatitude(), - mSavedLocation.getLongitude(), "", null, false, "", null); + mMyPosition = new MapObject("", 0L, 0, MapObject.MY_POSITION, "", "", "", "", + mSavedLocation.getLatitude(), mSavedLocation.getLongitude(), "", + null, false, "", null); return mMyPosition; } diff --git a/android/src/com/mapswithme/maps/routing/BaseRoutingErrorDialogFragment.java b/android/src/com/mapswithme/maps/routing/BaseRoutingErrorDialogFragment.java index bda356c1a5..0a7cff14cb 100644 --- a/android/src/com/mapswithme/maps/routing/BaseRoutingErrorDialogFragment.java +++ b/android/src/com/mapswithme/maps/routing/BaseRoutingErrorDialogFragment.java @@ -106,7 +106,7 @@ abstract class BaseRoutingErrorDialogFragment extends BaseMwmDialogFragment ((TextView) countryView.findViewById(R.id.tv__title)).setText(map.name); final TextView szView = (TextView) countryView.findViewById(R.id.tv__size); - szView.setText(MapManager.nativeIsLegacyMode() ? "" : StringUtils.getFileSizeString(map.totalSize - map.size)); + szView.setText(MapManager.nativeIsLegacyMode() ? "" : StringUtils.getFileSizeString(map.totalSize)); ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams) szView.getLayoutParams(); lp.rightMargin = 0; szView.setLayoutParams(lp); @@ -164,7 +164,7 @@ abstract class BaseRoutingErrorDialogFragment extends BaseMwmDialogFragment countries.add(data); if (!legacy) - size += (item.totalSize - item.size); + size += item.totalSize; } Map group = new HashMap<>(); diff --git a/android/src/com/mapswithme/maps/routing/RoutingController.java b/android/src/com/mapswithme/maps/routing/RoutingController.java index 0b6dfd17be..b545745129 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingController.java +++ b/android/src/com/mapswithme/maps/routing/RoutingController.java @@ -9,7 +9,6 @@ import android.support.annotation.MainThread; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; import android.support.v7.app.AlertDialog; import android.text.SpannableStringBuilder; import android.text.TextUtils; @@ -286,7 +285,7 @@ public class RoutingController return; } if (mContainer != null) - requestUberInfo(mContainer.getActivity().getSupportFragmentManager()); + requestUberInfo(); } setBuildState(BuildState.BUILDING); @@ -840,26 +839,26 @@ public class RoutingController return true; } - private void requestUberInfo(@NonNull FragmentManager fragmentManager) + private void requestUberInfo() { - NetworkPolicy.checkNetworkPolicy(fragmentManager, new NetworkPolicy.NetworkPolicyListener() - { - @Override - public void onResult(@NonNull NetworkPolicy policy) - { - mUberPlanning = true; - Uber.nativeRequestUberProducts(policy, mStartPoint.getLat(), - mStartPoint.getLon(), - mEndPoint.getLat(), mEndPoint.getLon()); - if (mContainer != null) - mContainer.updateBuildProgress(0, mLastRouterType); - } - }); + if (mStartPoint == null || mEndPoint == null) + throw new AssertionError("Start and end points must be set to make a taxi request!"); + + mUberPlanning = true; + + Uber.nativeRequestUberProducts(NetworkPolicy.newInstance(true), mStartPoint.getLat(), + mStartPoint.getLon(), + mEndPoint.getLat(), mEndPoint.getLon()); + if (mContainer != null) + mContainer.updateBuildProgress(0, mLastRouterType); } - @NonNull + @Nullable UberLinks getUberLink(@NonNull String productId) { + if (mStartPoint == null || mEndPoint == null) + return null; + return Uber.nativeGetUberLinks(productId, mStartPoint.getLat(), mStartPoint.getLon(), mEndPoint.getLat(), mEndPoint.getLon()); } diff --git a/android/src/com/mapswithme/maps/routing/RoutingErrorDialogFragment.java b/android/src/com/mapswithme/maps/routing/RoutingErrorDialogFragment.java index 3d22d0babf..1d3fbdae45 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingErrorDialogFragment.java +++ b/android/src/com/mapswithme/maps/routing/RoutingErrorDialogFragment.java @@ -80,7 +80,7 @@ public class RoutingErrorDialogFragment extends BaseRoutingErrorDialogFragment for (CountryItem country : mMissingMaps) { if (country.status != CountryItem.STATUS_PROGRESS) - size += (country.totalSize - country.size); + size += country.totalSize; } MapManager.warnOn3g(getActivity(), size, new Runnable() diff --git a/android/src/com/mapswithme/maps/routing/RoutingPlanController.java b/android/src/com/mapswithme/maps/routing/RoutingPlanController.java index 34fccf6810..395fa3f66d 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingPlanController.java +++ b/android/src/com/mapswithme/maps/routing/RoutingPlanController.java @@ -46,6 +46,7 @@ import com.mapswithme.util.Utils; import com.mapswithme.util.statistics.AlohaHelper; import com.mapswithme.util.statistics.Statistics; +import java.util.List; import java.util.Locale; public class RoutingPlanController extends ToolbarController implements SlotFrame.SlotClickListener @@ -497,9 +498,9 @@ public class RoutingPlanController extends ToolbarController implements SlotFram { UiUtils.hide(getViewById(R.id.error), mAltitudeChartFrame); - final UberInfo.Product[] products = info.getProducts(); + final List products = info.getProducts(); mUberInfo = info; - mUberProduct = products[0]; + mUberProduct = products.get(0); final PagerAdapter adapter = new UberAdapter(mActivity, products); DotPager pager = new DotPager.Builder(mActivity, (ViewPager) mUberFrame.findViewById(R.id.pager), adapter) .setIndicatorContainer((ViewGroup) mUberFrame.findViewById(R.id.indicator)) @@ -508,7 +509,7 @@ public class RoutingPlanController extends ToolbarController implements SlotFram @Override public void onPageChanged(int position) { - mUberProduct = products[position]; + mUberProduct = products.get(position); } }).build(); pager.show(); @@ -547,7 +548,15 @@ public class RoutingPlanController extends ToolbarController implements SlotFram TextView error = (TextView) getViewById(R.id.error); error.setText(message); error.setVisibility(View.VISIBLE); - getViewById(R.id.start).setVisibility(View.GONE); + showStartButton(false); + } + + void showStartButton(boolean show) + { + if (show) + UiUtils.show(getViewById(R.id.start)); + else + UiUtils.hide(getViewById(R.id.start)); } @NonNull @@ -591,8 +600,11 @@ public class RoutingPlanController extends ToolbarController implements SlotFram if (mUberProduct != null) { UberLinks links = RoutingController.get().getUberLink(mUberProduct.getProductId()); - Utils.launchUber(mActivity, links); - trackUberStatistics(isUberInstalled); + if (links != null) + { + Utils.launchUber(mActivity, links); + trackUberStatistics(isUberInstalled); + } } } }); @@ -617,7 +629,7 @@ public class RoutingPlanController extends ToolbarController implements SlotFram } UiUtils.updateAccentButton(start); - UiUtils.show(start); + showStartButton(true); } private static void trackUberStatistics(boolean isUberInstalled) diff --git a/android/src/com/mapswithme/maps/routing/RoutingPlanFragment.java b/android/src/com/mapswithme/maps/routing/RoutingPlanFragment.java index d04188f548..7ef06fef5b 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingPlanFragment.java +++ b/android/src/com/mapswithme/maps/routing/RoutingPlanFragment.java @@ -57,6 +57,11 @@ public class RoutingPlanFragment extends BaseMwmFragment mPlanController.showUberError(code); } + public void showStartButton(boolean show) + { + mPlanController.showStartButton(show); + } + @Override public boolean onBackPressed() { diff --git a/android/src/com/mapswithme/maps/search/HotelsFilter.java b/android/src/com/mapswithme/maps/search/HotelsFilter.java index 3d8ac6b91f..6e6c57e962 100644 --- a/android/src/com/mapswithme/maps/search/HotelsFilter.java +++ b/android/src/com/mapswithme/maps/search/HotelsFilter.java @@ -3,6 +3,7 @@ package com.mapswithme.maps.search; import android.os.Parcel; import android.os.Parcelable; import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import static com.mapswithme.maps.search.HotelsFilter.Op.FIELD_RATING; @@ -12,6 +13,7 @@ public class HotelsFilter implements Parcelable public final static int TYPE_AND = 0; public final static int TYPE_OR = 1; public final static int TYPE_OP = 2; + public final static int TYPE_ONE_OF = 3; public final int mType; @@ -112,6 +114,36 @@ public class HotelsFilter implements Parcelable } } + public static class OneOf extends HotelsFilter + { + @NonNull + public final HotelType mType; + @Nullable + public final OneOf mTile; + + public OneOf(@NonNull HotelType type, @Nullable OneOf tile) + { + super(TYPE_ONE_OF); + mType = type; + mTile = tile; + } + + public OneOf(Parcel source) + { + super(TYPE_ONE_OF); + mType = source.readParcelable(HotelType.class.getClassLoader()); + mTile = source.readParcelable(HotelsFilter.class.getClassLoader()); + } + + @Override + public void writeToParcel(Parcel dest, int flags) + { + super.writeToParcel(dest, flags); + dest.writeParcelable(mType, flags); + dest.writeParcelable(mTile, flags); + } + } + public static class RatingFilter extends Op { public final float mValue; @@ -186,6 +218,9 @@ public class HotelsFilter implements Parcelable if (type == TYPE_OR) return new Or(source); + if (type == TYPE_ONE_OF) + return new OneOf(source); + int field = source.readInt(); if (field == FIELD_RATING) return new RatingFilter(source); @@ -207,4 +242,79 @@ public class HotelsFilter implements Parcelable return new HotelsFilter[size]; } }; + + static class HotelType implements Parcelable + { + final int mType; + @NonNull + final String mTag; + + HotelType(int type, @NonNull String tag) + { + mType = type; + mTag = tag; + } + + protected HotelType(Parcel in) + { + mType = in.readInt(); + mTag = in.readString(); + } + + @Override + public void writeToParcel(Parcel dest, int flags) + { + dest.writeInt(mType); + dest.writeString(mTag); + } + + @Override + public int describeContents() + { + return 0; + } + + public int getType() + { + return mType; + } + + @NonNull + public String getTag() + { + return mTag; + } + + @Override + public boolean equals(Object o) + { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + HotelType type = (HotelType) o; + + return mType == type.mType; + } + + @Override + public int hashCode() + { + return mType; + } + + public static final Creator CREATOR = new Creator() + { + @Override + public HotelType createFromParcel(Parcel in) + { + return new HotelType(in); + } + + @Override + public HotelType[] newArray(int size) + { + return new HotelType[size]; + } + }; + } } diff --git a/android/src/com/mapswithme/maps/search/HotelsFilterView.java b/android/src/com/mapswithme/maps/search/HotelsFilterView.java index 7a78539855..3cff7d8467 100644 --- a/android/src/com/mapswithme/maps/search/HotelsFilterView.java +++ b/android/src/com/mapswithme/maps/search/HotelsFilterView.java @@ -3,26 +3,34 @@ package com.mapswithme.maps.search; import android.annotation.TargetApi; import android.content.Context; import android.content.res.Resources; +import android.graphics.drawable.Drawable; import android.os.Build; import android.os.Bundle; import android.support.annotation.CallSuper; import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import android.support.v4.content.ContextCompat; +import android.support.v7.widget.RecyclerView; import android.util.AttributeSet; -import android.util.DisplayMetrics; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; -import android.widget.ScrollView; import com.mapswithme.maps.R; +import com.mapswithme.maps.widget.recycler.TagItemDecoration; +import com.mapswithme.maps.widget.recycler.TagLayoutManager; import com.mapswithme.util.Animations; import com.mapswithme.util.InputUtils; import com.mapswithme.util.UiUtils; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; + public class HotelsFilterView extends FrameLayout + implements HotelsTypeAdapter.OnTypeSelectedListener { private static final String STATE_OPENED = "state_opened"; @@ -41,6 +49,11 @@ public class HotelsFilterView extends FrameLayout private View mElevation; private int mHeaderHeight; private int mButtonsHeight; + private Drawable mTagsDecorator; + @NonNull + private final Set mHotelTypes = new HashSet<>(); + @Nullable + private HotelsTypeAdapter mTypeAdapter; @Nullable private HotelsFilterListener mListener; @@ -79,6 +92,7 @@ public class HotelsFilterView extends FrameLayout UiUtils.getStyledResourceId(context, android.R.attr.actionBarSize)); mButtonsHeight = (int) res.getDimension(R.dimen.height_block_base); LayoutInflater.from(context).inflate(R.layout.hotels_filter, this, true); + mTagsDecorator = ContextCompat.getDrawable(context, R.drawable.divider_transparent_half); } @CallSuper @@ -86,6 +100,9 @@ public class HotelsFilterView extends FrameLayout protected void onFinishInflate() { super.onFinishInflate(); + if (isInEditMode()) + return; + mFrame = findViewById(R.id.frame); mFrame.setTranslationY(mFrame.getResources().getDisplayMetrics().heightPixels); mFade = findViewById(R.id.fade); @@ -93,6 +110,12 @@ public class HotelsFilterView extends FrameLayout mPrice = (PriceFilterView) findViewById(R.id.price); mContent = mFrame.findViewById(R.id.content); mElevation = mFrame.findViewById(R.id.elevation); + RecyclerView type = (RecyclerView) mContent.findViewById(R.id.type); + type.setLayoutManager(new TagLayoutManager()); + type.setNestedScrollingEnabled(false); + type.addItemDecoration(new TagItemDecoration(mTagsDecorator)); + mTypeAdapter = new HotelsTypeAdapter(this); + type.setAdapter(mTypeAdapter); findViewById(R.id.cancel).setOnClickListener(new OnClickListener() { @Override @@ -119,9 +142,10 @@ public class HotelsFilterView extends FrameLayout public void onClick(View v) { mFilter = null; + mHotelTypes.clear(); if (mListener != null) mListener.onDone(null); - close(); + updateViews(); } }); } @@ -131,6 +155,9 @@ public class HotelsFilterView extends FrameLayout { super.onMeasure(widthMeasureSpec, heightMeasureSpec); + if (isInEditMode()) + return; + mContent.measure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED)); mElevation.measure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED)); int height = mContent.getMeasuredHeight() + mHeaderHeight + mButtonsHeight @@ -154,27 +181,40 @@ public class HotelsFilterView extends FrameLayout private void populateFilter() { mPrice.updateFilter(); - HotelsFilter.RatingFilter rating = mRating.getFilter(); - HotelsFilter price = mPrice.getFilter(); - if (rating == null && price == null) + final HotelsFilter.RatingFilter rating = mRating.getFilter(); + final HotelsFilter price = mPrice.getFilter(); + final HotelsFilter.OneOf oneOf = makeOneOf(mHotelTypes.iterator()); + + mFilter = combineFilters(rating, price, oneOf); + } + + @Nullable + private HotelsFilter.OneOf makeOneOf(@NonNull Iterator iterator) + { + if (!iterator.hasNext()) + return null; + + HotelsFilter.HotelType type = iterator.next(); + return new HotelsFilter.OneOf(type, makeOneOf(iterator)); + } + + @Nullable + private HotelsFilter combineFilters(@NonNull HotelsFilter... filters) + { + HotelsFilter result = null; + for (HotelsFilter filter : filters) { - mFilter = null; - return; + if (result == null) + { + result = filter; + continue; + } + + if (filter != null) + result = new HotelsFilter.And(filter, result); } - if (rating == null) - { - mFilter = price; - return; - } - - if (price == null) - { - mFilter = rating; - return; - } - - mFilter = new HotelsFilter.And(rating, price); + return result; } @Override @@ -209,61 +249,123 @@ public class HotelsFilterView extends FrameLayout mOpened = true; mFilter = filter; - updateViews(); Animations.fadeInView(mFade, null); - Animations.appearSliding(mFrame, Animations.BOTTOM, null); + Animations.appearSliding(mFrame, Animations.BOTTOM, new Runnable() + { + @Override + public void run() + { + updateViews(); + } + }); InputUtils.hideKeyboard(this); } - /** - * Update views state according with current {@link #mFilter} - * - * mFilter may be null or {@link HotelsFilter.RatingFilter} or {@link HotelsFilter.PriceRateFilter} - * or {@link HotelsFilter.And} or {@link HotelsFilter.Or}. - * - * if mFilter is {@link HotelsFilter.And} then mLhs must be {@link HotelsFilter.RatingFilter} and - * mRhs must be {@link HotelsFilter.PriceRateFilter} or {@link HotelsFilter.Or} with mLhs and mRhs - - * {@link HotelsFilter.PriceRateFilter} - * - * if mFilter is {@link HotelsFilter.Or} then mLhs and mRhs must be {@link HotelsFilter.PriceRateFilter} - */ private void updateViews() { if (mFilter == null) { mRating.update(null); mPrice.update(null); + if (mTypeAdapter != null) + updateTypeAdapter(mTypeAdapter, null); } else { - HotelsFilter.RatingFilter rating = null; - HotelsFilter price = null; - if (mFilter instanceof HotelsFilter.RatingFilter) - { - rating = (HotelsFilter.RatingFilter) mFilter; - } - else if (mFilter instanceof HotelsFilter.PriceRateFilter) - { - price = mFilter; - } - else if (mFilter instanceof HotelsFilter.And) - { - HotelsFilter.And and = (HotelsFilter.And) mFilter; - if (!(and.mLhs instanceof HotelsFilter.RatingFilter)) - throw new AssertionError("And.mLhs must be RatingFilter"); - - rating = (HotelsFilter.RatingFilter) and.mLhs; - price = and.mRhs; - } - else if (mFilter instanceof HotelsFilter.Or) - { - price = mFilter; - } - mRating.update(rating); - mPrice.update(price); + mRating.update(findRatingFilter(mFilter)); + mPrice.update(findPriceFilter(mFilter)); + if (mTypeAdapter != null) + updateTypeAdapter(mTypeAdapter, findTypeFilter(mFilter)); } } + @Nullable + private HotelsFilter.RatingFilter findRatingFilter(@NonNull HotelsFilter filter) + { + if (filter instanceof HotelsFilter.RatingFilter) + return (HotelsFilter.RatingFilter) filter; + + HotelsFilter.RatingFilter result; + if (filter instanceof HotelsFilter.And) + { + HotelsFilter.And and = (HotelsFilter.And) filter; + result = findRatingFilter(and.mLhs); + if (result == null) + result = findRatingFilter(and.mRhs); + + return result; + } + + return null; + } + + @Nullable + private HotelsFilter findPriceFilter(@NonNull HotelsFilter filter) + { + if (filter instanceof HotelsFilter.PriceRateFilter) + return filter; + + if (filter instanceof HotelsFilter.Or) + { + HotelsFilter.Or or = (HotelsFilter.Or) filter; + if (or.mLhs instanceof HotelsFilter.PriceRateFilter + && or.mRhs instanceof HotelsFilter.PriceRateFilter ) + { + return filter; + } + } + + HotelsFilter result; + if (filter instanceof HotelsFilter.And) + { + HotelsFilter.And and = (HotelsFilter.And) filter; + result = findPriceFilter(and.mLhs); + if (result == null) + result = findPriceFilter(and.mRhs); + + return result; + } + + return null; + } + + @Nullable + private HotelsFilter.OneOf findTypeFilter(@NonNull HotelsFilter filter) + { + if (filter instanceof HotelsFilter.OneOf) + return (HotelsFilter.OneOf) filter; + + HotelsFilter.OneOf result; + if (filter instanceof HotelsFilter.And) + { + HotelsFilter.And and = (HotelsFilter.And) filter; + result = findTypeFilter(and.mLhs); + if (result == null) + result = findTypeFilter(and.mRhs); + + return result; + } + + return null; + } + + private void updateTypeAdapter(@NonNull HotelsTypeAdapter typeAdapter, + @Nullable HotelsFilter.OneOf types) + { + mHotelTypes.clear(); + if (types != null) + populateHotelTypes(mHotelTypes, types); + typeAdapter.updateItems(mHotelTypes); + } + + private void populateHotelTypes(@NonNull Set hotelTypes, + @NonNull HotelsFilter.OneOf types) + { + hotelTypes.add(types.mType); + if (types.mTile != null) + populateHotelTypes(hotelTypes, types.mTile); + } + public void setListener(@Nullable HotelsFilterListener listener) { mListener = listener; @@ -279,4 +381,13 @@ public class HotelsFilterView extends FrameLayout if (state.getBoolean(STATE_OPENED, false)) open(filter); } + + @Override + public void onTypeSelected(boolean selected, @NonNull HotelsFilter.HotelType type) + { + if (selected) + mHotelTypes.add(type); + else + mHotelTypes.remove(type); + } } diff --git a/android/src/com/mapswithme/maps/search/HotelsTypeAdapter.java b/android/src/com/mapswithme/maps/search/HotelsTypeAdapter.java new file mode 100644 index 0000000000..b5291001f6 --- /dev/null +++ b/android/src/com/mapswithme/maps/search/HotelsTypeAdapter.java @@ -0,0 +1,168 @@ +package com.mapswithme.maps.search; + +import android.content.Context; +import android.content.res.Resources; +import android.support.annotation.ColorRes; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.content.ContextCompat; +import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import com.mapswithme.maps.MwmApplication; +import com.mapswithme.maps.R; +import com.mapswithme.util.UiUtils; +import com.mapswithme.util.log.Logger; +import com.mapswithme.util.log.LoggerFactory; + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +class HotelsTypeAdapter extends RecyclerView.Adapter +{ + private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC); + private static final String TAG = HotelsTypeAdapter.class.getName(); + + @NonNull + private static final String SEARCH_HOTEL_FILTER = MwmApplication + .get().getString(R.string.search_hotel_filter); + @NonNull + private static final HotelsFilter.HotelType[] TYPES = SearchEngine.nativeGetHotelTypes(); + + @Nullable + private final OnTypeSelectedListener mListener; + @NonNull + private final List mItems; + + HotelsTypeAdapter(@Nullable OnTypeSelectedListener listener) + { + mListener = listener; + mItems = new ArrayList<>(); + for (HotelsFilter.HotelType type : TYPES) + mItems.add(new Item(type)); + } + + @Override + public HotelsTypeViewHolder onCreateViewHolder(ViewGroup parent, int viewType) + { + final LayoutInflater inflater = LayoutInflater.from(parent.getContext()); + return new HotelsTypeViewHolder(inflater.inflate(R.layout.item_tag, parent, false), mItems, + mListener); + } + + @Override + public void onBindViewHolder(HotelsTypeViewHolder holder, int position) + { + holder.bind(mItems.get(position)); + } + + @Override + public int getItemCount() + { + return mItems.size(); + } + + void updateItems(@NonNull Set selectedTypes) + { + for (Item item : mItems) + item.mSelected = selectedTypes.contains(item.mType); + + notifyDataSetChanged(); + } + + static class HotelsTypeViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener + { + @NonNull + private final View mFrame; + @NonNull + private final TextView mTitle; + @NonNull + private final List mItems; + @Nullable + private OnTypeSelectedListener mListener; + + HotelsTypeViewHolder(@NonNull View itemView, @NonNull List items, + @Nullable OnTypeSelectedListener listener) + { + super(itemView); + + mFrame = itemView; + mItems = items; + mListener = listener; + mTitle = (TextView) itemView.findViewById(R.id.tv__tag); + mFrame.setOnClickListener(this); + } + + void bind(@NonNull Item item) + { + mTitle.setText(getStringResourceByTag(item.mType.getTag())); + mFrame.setSelected(item.mSelected); + updateTitleColor(); + } + + @Override + public void onClick(View v) + { + int position = getAdapterPosition(); + if(position == RecyclerView.NO_POSITION) + return; + + mFrame.setSelected(!mFrame.isSelected()); + updateTitleColor(); + Item item = mItems.get(position); + item.mSelected = mFrame.isSelected(); + if (mListener != null) + mListener.onTypeSelected(item.mSelected, item.mType); + } + + @NonNull + private String getStringResourceByTag(@NonNull String tag) + { + try + { + Context context = mFrame.getContext(); + Resources resources = context.getResources(); + return resources.getString(resources.getIdentifier(String.format(SEARCH_HOTEL_FILTER, tag), + "string", + context.getPackageName())); + } + catch (Resources.NotFoundException e) + { + LOGGER.e(TAG, "Not found resource for hotel tag " + tag, e); + } + + return tag; + } + + private void updateTitleColor() + { + boolean select = mFrame.isSelected(); + @ColorRes + int titleColor = + select ? UiUtils.getStyledResourceId(mFrame.getContext(), R.attr.accentButtonTextColor) + : UiUtils.getStyledResourceId(mFrame.getContext(), android.R.attr.textColorPrimary); + mTitle.setTextColor(ContextCompat.getColor(mFrame.getContext(), titleColor)); + } + } + + interface OnTypeSelectedListener + { + void onTypeSelected(boolean selected, @NonNull HotelsFilter.HotelType type); + } + + static class Item + { + @NonNull + private final HotelsFilter.HotelType mType; + private boolean mSelected; + + Item(@NonNull HotelsFilter.HotelType type) + { + mType = type; + } + } +} diff --git a/android/src/com/mapswithme/maps/search/SearchEngine.java b/android/src/com/mapswithme/maps/search/SearchEngine.java index 06f782601a..727b349806 100644 --- a/android/src/com/mapswithme/maps/search/SearchEngine.java +++ b/android/src/com/mapswithme/maps/search/SearchEngine.java @@ -8,6 +8,7 @@ import com.mapswithme.util.Language; import com.mapswithme.util.Listeners; import com.mapswithme.util.concurrency.UiThread; +import android.support.annotation.NonNull; import android.support.annotation.Nullable; public enum SearchEngine implements NativeSearchListener, @@ -174,4 +175,10 @@ public enum SearchEngine implements NativeSearchListener, private static native void nativeShowAllResults(); public static native void nativeCancelInteractiveSearch(); + + /** + * @return all existing hotel types + */ + @NonNull + static native HotelsFilter.HotelType[] nativeGetHotelTypes(); } diff --git a/android/src/com/mapswithme/maps/search/SearchFilterController.java b/android/src/com/mapswithme/maps/search/SearchFilterController.java index 556de6de9e..439dce9288 100644 --- a/android/src/com/mapswithme/maps/search/SearchFilterController.java +++ b/android/src/com/mapswithme/maps/search/SearchFilterController.java @@ -166,9 +166,7 @@ public class SearchFilterController mFilterIcon.setImageResource(R.drawable.ic_cancel); mFilterIcon.setColorFilter(ContextCompat.getColor(mFrame.getContext(), UiUtils.getStyledResourceId(mFrame.getContext(), R.attr.accentButtonTextColor))); - UiUtils.setBackgroundDrawable(mFilterButton, R.attr.accentButtonBackground); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) - mFilterButton.setElevation(mElevation); + UiUtils.setBackgroundDrawable(mFilterButton, R.attr.accentButtonRoundBackground); mFilterText.setTextColor(ContextCompat.getColor(mFrame.getContext(), UiUtils.getStyledResourceId(mFrame.getContext(), R.attr.accentButtonTextColor))); } @@ -179,8 +177,6 @@ public class SearchFilterController mFilterIcon.setColorFilter(ContextCompat.getColor(mFrame.getContext(), UiUtils.getStyledResourceId(mFrame.getContext(), R.attr.colorAccent))); UiUtils.setBackgroundDrawable(mFilterButton, R.attr.clickableBackground); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) - mFilterButton.setElevation(0); mFilterText.setTextColor(ContextCompat.getColor(mFrame.getContext(), UiUtils.getStyledResourceId(mFrame.getContext(), R.attr.colorAccent))); } diff --git a/android/src/com/mapswithme/maps/search/SearchFragment.java b/android/src/com/mapswithme/maps/search/SearchFragment.java index 79e62919cc..67a4f0ef53 100644 --- a/android/src/com/mapswithme/maps/search/SearchFragment.java +++ b/android/src/com/mapswithme/maps/search/SearchFragment.java @@ -467,7 +467,7 @@ public class SearchFragment extends BaseMwmFragment if (mFromRoutePlan) { //noinspection ConstantConditions - final MapObject point = new MapObject(MapObject.SEARCH, result.name, "", + final MapObject point = new MapObject("", 0L, 0, MapObject.SEARCH, result.name, "", result.description.featureType, "", result.lat, result.lon, "", null, false, "", null); RoutingController.get().onPoiSelected(point); } diff --git a/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java b/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java index 0b67d7d03d..bae2cca1e8 100644 --- a/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java +++ b/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java @@ -425,7 +425,8 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment int curValue = Config.getUseMobileDataSettings(); - if (curValue != NetworkPolicy.NOT_TODAY && curValue != NetworkPolicy.TODAY) + if (curValue != NetworkPolicy.NOT_TODAY && curValue != NetworkPolicy.TODAY + && curValue != NetworkPolicy.NONE) { mobilePref.setValue(String.valueOf(curValue)); mobilePref.setSummary(mobilePref.getEntry()); diff --git a/android/src/com/mapswithme/maps/uber/UberAdapter.java b/android/src/com/mapswithme/maps/uber/UberAdapter.java index 2fc7ab98f4..7fb0a658b0 100644 --- a/android/src/com/mapswithme/maps/uber/UberAdapter.java +++ b/android/src/com/mapswithme/maps/uber/UberAdapter.java @@ -11,14 +11,16 @@ import android.widget.TextView; import com.mapswithme.maps.R; import com.mapswithme.maps.routing.RoutingController; +import java.util.List; + public class UberAdapter extends PagerAdapter { @NonNull private final Context mContext; @NonNull - private final UberInfo.Product[] mProducts; + private final List mProducts; - public UberAdapter(@NonNull Context context, @NonNull UberInfo.Product[] products) + public UberAdapter(@NonNull Context context, @NonNull List products) { mContext = context; mProducts = products; @@ -27,7 +29,7 @@ public class UberAdapter extends PagerAdapter @Override public int getCount() { - return mProducts.length; + return mProducts.size(); } @Override @@ -39,7 +41,7 @@ public class UberAdapter extends PagerAdapter @Override public Object instantiateItem(ViewGroup container, int position) { - UberInfo.Product product = mProducts[position]; + UberInfo.Product product = mProducts.get(position); View v = LayoutInflater.from(mContext).inflate(R.layout.uber_pager_item, container, false); TextView name = (TextView) v.findViewById(R.id.product_name); diff --git a/android/src/com/mapswithme/maps/uber/UberInfo.java b/android/src/com/mapswithme/maps/uber/UberInfo.java index f1b8ade10c..26495f22ef 100644 --- a/android/src/com/mapswithme/maps/uber/UberInfo.java +++ b/android/src/com/mapswithme/maps/uber/UberInfo.java @@ -3,9 +3,10 @@ package com.mapswithme.maps.uber; import android.os.Parcel; import android.os.Parcelable; import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import java.util.ArrayList; import java.util.Arrays; +import java.util.List; public class UberInfo implements Parcelable { @@ -25,20 +26,22 @@ public class UberInfo implements Parcelable }; @NonNull - private final Product[] mProducts; + private final List mProducts; private UberInfo(@NonNull Product[] products) { - mProducts = products; + mProducts = new ArrayList<>(Arrays.asList(products)); } private UberInfo(@NonNull Parcel parcel) { - mProducts = (Product[]) parcel.readParcelableArray(Product.class.getClassLoader()); + List products = new ArrayList<>(); + parcel.readTypedList(products, Product.CREATOR); + mProducts = products; } @NonNull - public Product[] getProducts() + public List getProducts() { return mProducts; } @@ -47,7 +50,7 @@ public class UberInfo implements Parcelable public String toString() { return "UberInfo{" + - "mProducts=" + Arrays.toString(mProducts) + + "mProducts=" + mProducts + '}'; } @@ -60,7 +63,7 @@ public class UberInfo implements Parcelable @Override public void writeToParcel(Parcel dest, int flags) { - dest.writeParcelableArray(mProducts, 0); + dest.writeTypedList(mProducts); } public static class Product implements Parcelable diff --git a/android/src/com/mapswithme/maps/widget/placepage/BannerController.java b/android/src/com/mapswithme/maps/widget/placepage/BannerController.java index faec6d1188..41e8fab627 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/BannerController.java +++ b/android/src/com/mapswithme/maps/widget/placepage/BannerController.java @@ -13,6 +13,7 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.R; import com.mapswithme.maps.ads.AdTracker; import com.mapswithme.maps.ads.Banner; @@ -34,6 +35,9 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; import static com.mapswithme.util.SharedPropertiesUtils.isShowcaseSwitchedOnLocal; import static com.mapswithme.util.statistics.Statistics.EventName.PP_BANNER_CLICK; import static com.mapswithme.util.statistics.Statistics.EventName.PP_BANNER_SHOW; +import static com.mapswithme.util.statistics.Statistics.PP_BANNER_STATE_DETAILS; +import static com.mapswithme.util.statistics.Statistics.PP_BANNER_STATE_PREVIEW; + final class BannerController { @@ -81,6 +85,8 @@ final class BannerController private CompoundNativeAdLoader mAdsLoader; @Nullable private AdTracker mAdTracker; + @NonNull + private MyNativeAdsListener mAdsListener = new MyNativeAdsListener(); BannerController(@NonNull View bannerView, @Nullable BannerListener listener, @NonNull CompoundNativeAdLoader loader, @Nullable AdTracker tracker) @@ -106,7 +112,6 @@ final class BannerController }); Resources res = mFrame.getResources(); UiUtils.expandTouchAreaForView(mAds, (int) res.getDimension(R.dimen.margin_quarter_plus)); - loader.setAdListener(new MyNativeAdsListener()); mAdsLoader = loader; mAdTracker = tracker; mFrame.setOnClickListener(new View.OnClickListener() @@ -181,8 +186,7 @@ final class BannerController } UiUtils.show(mFrame); - - mAdsLoader.loadAd(mFrame.getContext(), mBanners); + mAdsLoader.loadAd(MwmApplication.get(), mBanners); updateVisibility(); } @@ -260,9 +264,26 @@ final class BannerController return; if (isVisible) + { mAdTracker.onViewShown(mCurrentAd.getProvider(), mCurrentAd.getBannerId()); + mCurrentAd.registerView(mFrame); + } else + { mAdTracker.onViewHidden(mCurrentAd.getProvider(), mCurrentAd.getBannerId()); + mCurrentAd.unregisterView(mFrame); + } + } + + void detach() + { + mAdsLoader.detach(); + mAdsLoader.setAdListener(null); + } + + void attach() + { + mAdsLoader.setAdListener(mAdsListener); } private void fillViews(@NonNull MwmNativeAd data) @@ -285,7 +306,7 @@ final class BannerController else if (!mOpened) { close(); - Statistics.INSTANCE.trackPPBanner(PP_BANNER_SHOW, data, 0); + Statistics.INSTANCE.trackPPBanner(PP_BANNER_SHOW, data, PP_BANNER_STATE_PREVIEW); } else { @@ -382,7 +403,8 @@ final class BannerController @Override public void onClick(@NonNull MwmNativeAd ad) { - Statistics.INSTANCE.trackPPBanner(PP_BANNER_CLICK, ad, mOpened ? 1 : 0); + Statistics.INSTANCE.trackPPBanner(PP_BANNER_CLICK, ad, + mOpened ? PP_BANNER_STATE_DETAILS : PP_BANNER_STATE_PREVIEW); } } } diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java index f2a47777f7..4ffe6b85ba 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java @@ -152,12 +152,14 @@ public class PlacePageView extends RelativeLayout private View mWiki; private View mEntrance; private TextView mTvEntrance; + private View mTaxiDivider; private View mTaxi; private View mEditPlace; private View mAddOrganisation; private View mAddPlace; private View mLocalAd; private TextView mTvLocalAd; + private View mEditTopSpace; // Bookmark private View mBookmarkFrame; private WebView mWvBookmarkNote; @@ -298,6 +300,18 @@ public class PlacePageView extends RelativeLayout mBannerController.onChangedVisibility(false); } + public void onActivityStopped() + { + if (mBannerController != null) + mBannerController.detach(); + } + + public void onActivityStarted() + { + if (mBannerController != null) + mBannerController.attach(); + } + private void initViews() { LayoutInflater.from(getContext()).inflate(R.layout.place_page, this); @@ -346,6 +360,7 @@ public class PlacePageView extends RelativeLayout mWiki.setOnClickListener(this); mEntrance = mDetails.findViewById(R.id.ll__place_entrance); mTvEntrance = (TextView) mEntrance.findViewById(R.id.tv__place_entrance); + mTaxiDivider = mDetails.findViewById(R.id.place_page_taxi_divider); mTaxi = mDetails.findViewById(R.id.ll__place_page_taxi); TextView orderTaxi = (TextView) mTaxi.findViewById(R.id.tv__place_page_order_taxi); orderTaxi.setOnClickListener(this); @@ -358,6 +373,7 @@ public class PlacePageView extends RelativeLayout mLocalAd = mDetails.findViewById(R.id.ll__local_ad); mLocalAd.setOnClickListener(this); mTvLocalAd = (TextView) mLocalAd.findViewById(R.id.tv__local_ad); + mEditTopSpace = mDetails.findViewById(R.id.edit_top_space); latlon.setOnLongClickListener(this); address.setOnLongClickListener(this); mPhone.setOnLongClickListener(this); @@ -373,7 +389,7 @@ public class PlacePageView extends RelativeLayout mTvBookmarkNote = (TextView) mBookmarkFrame.findViewById(R.id.tv__bookmark_notes); mBookmarkFrame.findViewById(R.id.tv__bookmark_edit).setOnClickListener(this); - ViewGroup ppButtons = (ViewGroup) findViewById(R.id.pp__buttons); + ViewGroup ppButtons = (ViewGroup) findViewById(R.id.pp__buttons).findViewById(R.id.container); mHeightCompensationView = findViewById(R.id.pp__height_compensation); @@ -605,7 +621,7 @@ public class PlacePageView extends RelativeLayout mRvHotelGallery.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false)); mRvHotelGallery.addItemDecoration(new DividerItemDecoration(ContextCompat.getDrawable(getContext(), - R.drawable.divider_transparent))); + R.drawable.divider_transparent_quarter))); mGalleryAdapter.setListener(this); mRvHotelGallery.setAdapter(mGalleryAdapter); } @@ -1198,13 +1214,7 @@ public class PlacePageView extends RelativeLayout final String website = mapObject.getMetadata(Metadata.MetadataType.FMD_WEBSITE); refreshMetadataOrHide(TextUtils.isEmpty(website) ? mapObject.getMetadata(Metadata.MetadataType.FMD_URL) : website, mWebsite, mTvWebsite); - UiUtils.hide(mHotelDescription); - UiUtils.hide(mHotelFacilities); - UiUtils.hide(mHotelGallery); - UiUtils.hide(mHotelNearby); - UiUtils.hide(mHotelReview); -// TODO: remove this after booking_api.cpp will be done - UiUtils.hide(mHotelMore); + hideHotelViews(); } else { @@ -1212,7 +1222,7 @@ public class PlacePageView extends RelativeLayout UiUtils.show(mHotelMore); if (mSponsored.getType() != Sponsored.TYPE_BOOKING) - UiUtils.hide(mHotelMore); + hideHotelViews(); } refreshMetadataOrHide(mapObject.getMetadata(Metadata.MetadataType.FMD_PHONE_NUMBER), mPhone, mTvPhone); @@ -1228,24 +1238,33 @@ public class PlacePageView extends RelativeLayout LocationHelper.INSTANCE.getMyPosition() != null && ConnectionState.isConnected(); - UiUtils.showIf(showTaxiOffer, mTaxi); + UiUtils.showIf(showTaxiOffer, mTaxi, mTaxiDivider); boolean inRouting = RoutingController.get().isNavigating() || RoutingController.get().isPlanning(); if (inRouting || MapManager.nativeIsLegacyMode()) { - UiUtils.hide(mEditPlace, mAddOrganisation, mAddPlace, mLocalAd); + UiUtils.hide(mEditPlace, mAddOrganisation, mAddPlace, mLocalAd, mEditTopSpace); } else { UiUtils.showIf(Editor.nativeShouldShowEditPlace(), mEditPlace); UiUtils.showIf(Editor.nativeShouldShowAddBusiness(), mAddOrganisation); UiUtils.showIf(Editor.nativeShouldShowAddPlace(), mAddPlace); + UiUtils.showIf(UiUtils.isVisible(mEditPlace) + || UiUtils.isVisible(mAddOrganisation) + || UiUtils.isVisible(mAddPlace), mEditTopSpace); refreshLocalAdInfo(mapObject); } } + private void hideHotelViews() + { + UiUtils.hide(mHotelDescription, mHotelFacilities, mHotelGallery, mHotelNearby, + mHotelReview, mHotelMore); + } + private void refreshLocalAdInfo(@NonNull MapObject mapObject) { LocalAdInfo localAdInfo = mapObject.getLocalAdInfo(); @@ -1539,7 +1558,10 @@ public class PlacePageView extends RelativeLayout throw new AssertionError("A local ad must be non-null if button is shown!"); if (!TextUtils.isEmpty(localAdInfo.getUrl())) + { + Statistics.INSTANCE.trackPPOwnershipButtonClick(mMapObject); Utils.openUrl(getContext(), localAdInfo.getUrl()); + } } break; case R.id.ll__more: @@ -1560,9 +1582,13 @@ public class PlacePageView extends RelativeLayout break; case R.id.ll__place_phone: Utils.callPhone(getContext(), mTvPhone.getText().toString()); + if (mMapObject != null) + Framework.logLocalAdsEvent(Framework.LOCAL_ADS_EVENT_CLICKED_PHONE, mMapObject); break; case R.id.ll__place_website: Utils.openUrl(getContext(), mTvWebsite.getText().toString()); + if (mMapObject != null) + Framework.logLocalAdsEvent(Framework.LOCAL_ADS_EVENT_CLICKED_WEBSITE, mMapObject); break; case R.id.ll__place_wiki: // TODO: Refactor and use separate getters for Wiki and all other PP meta info too. diff --git a/android/src/com/mapswithme/maps/widget/recycler/TagItemDecoration.java b/android/src/com/mapswithme/maps/widget/recycler/TagItemDecoration.java new file mode 100644 index 0000000000..bfd7085238 --- /dev/null +++ b/android/src/com/mapswithme/maps/widget/recycler/TagItemDecoration.java @@ -0,0 +1,83 @@ +package com.mapswithme.maps.widget.recycler; + +import android.graphics.Canvas; +import android.graphics.Rect; +import android.graphics.drawable.Drawable; +import android.support.annotation.NonNull; +import android.support.v7.widget.RecyclerView; +import android.view.View; + +/** + * Adds interior dividers to a RecyclerView with a TagLayoutManager or its + * subclass. + */ +public class TagItemDecoration extends RecyclerView.ItemDecoration +{ + @NonNull + private final Drawable mDivider; + + public TagItemDecoration(@NonNull Drawable divider) + { + mDivider = divider; + } + + /** + * Draws horizontal and vertical dividers onto the parent RecyclerView. + * + * @param canvas The {@link Canvas} onto which dividers will be drawn + * @param parent The RecyclerView onto which dividers are being added + * @param state The current RecyclerView.State of the RecyclerView + */ + @Override + public void onDraw(Canvas canvas, RecyclerView parent, RecyclerView.State state) + { + if (state.isMeasuring()) + return; + + int parentRight = parent.getWidth() - parent.getPaddingRight(); + int parentLeft = parent.getPaddingLeft(); + int lastHeight = Integer.MIN_VALUE; + + int childCount = parent.getChildCount(); + for (int i = 0; i < childCount; i++) + { + View child = parent.getChildAt(i); + + if (child.getTop() <= lastHeight) + { + mDivider.setBounds(child.getLeft() - mDivider.getIntrinsicWidth(), + child.getTop(), + child.getLeft(), + child.getBottom()); + } + else + { + mDivider.setBounds(parentLeft, + child.getTop() - mDivider.getIntrinsicHeight(), + parentRight, + child.getTop()); + } + mDivider.draw(canvas); + lastHeight = child.getTop(); + } + } + + /** + * Determines the size and location of offsets between items in the parent + * RecyclerView. + * + * @param outRect The {@link Rect} of offsets to be added around the child + * view + * @param view The child view to be decorated with an offset + * @param parent The RecyclerView onto which dividers are being added + * @param state The current RecyclerView.State of the RecyclerView + */ + @Override + public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) + { + super.getItemOffsets(outRect, view, parent, state); + + outRect.left = mDivider.getIntrinsicWidth(); + outRect.top = mDivider.getIntrinsicHeight(); + } +} diff --git a/android/src/com/mapswithme/maps/widget/recycler/TagLayoutManager.java b/android/src/com/mapswithme/maps/widget/recycler/TagLayoutManager.java new file mode 100644 index 0000000000..f4297ba2b9 --- /dev/null +++ b/android/src/com/mapswithme/maps/widget/recycler/TagLayoutManager.java @@ -0,0 +1,60 @@ +package com.mapswithme.maps.widget.recycler; + +import android.support.v7.widget.RecyclerView; +import android.view.View; + +/** + * This LayoutManager designed only for use with RecyclerView.setNestedScrollingEnabled(false) + * and recycle item must be wrap_content or fixed size + */ +public class TagLayoutManager extends RecyclerView.LayoutManager +{ + public TagLayoutManager() + { + setAutoMeasureEnabled(true); + } + + @Override + public RecyclerView.LayoutParams generateDefaultLayoutParams() + { + return new RecyclerView.LayoutParams(RecyclerView.LayoutParams.MATCH_PARENT, + RecyclerView.LayoutParams.WRAP_CONTENT); + } + + @Override + public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) + { + detachAndScrapAttachedViews(recycler); + + int widthUsed = 0; + int heightUsed = 0; + int lineHeight = 0; + int itemsCountOneLine = 0; + for (int i = 0; i < getItemCount(); i++) + { + View child = recycler.getViewForPosition(i); + addView(child); + measureChildWithMargins(child, widthUsed, heightUsed); + int width = getDecoratedMeasuredWidth(child); + int height = getDecoratedMeasuredHeight(child); + lineHeight = Math.max(lineHeight, height); + if (widthUsed + width >= getWidth()) + { + widthUsed = 0; + if (itemsCountOneLine > 0) + { + itemsCountOneLine = -1; + heightUsed += lineHeight; + child.forceLayout(); + measureChildWithMargins(child, widthUsed, heightUsed); + width = getDecoratedMeasuredWidth(child); + height = getDecoratedMeasuredHeight(child); + } + lineHeight = 0; + } + layoutDecorated(child, widthUsed, heightUsed, widthUsed + width, heightUsed + height); + widthUsed += width; + itemsCountOneLine++; + } + } +} diff --git a/android/src/com/mapswithme/util/Config.java b/android/src/com/mapswithme/util/Config.java index 2b6092ddee..1ce5a0ffda 100644 --- a/android/src/com/mapswithme/util/Config.java +++ b/android/src/com/mapswithme/util/Config.java @@ -233,7 +233,7 @@ public final class Config @NetworkPolicy.NetworkPolicyDef public static int getUseMobileDataSettings() { - switch(getInt(KEY_MISC_USE_MOBILE_DATA, NetworkPolicy.ASK)) + switch(getInt(KEY_MISC_USE_MOBILE_DATA, NetworkPolicy.NONE)) { case NetworkPolicy.ASK: return NetworkPolicy.ASK; @@ -245,6 +245,8 @@ public final class Config return NetworkPolicy.NOT_TODAY; case NetworkPolicy.TODAY: return NetworkPolicy.TODAY; + case NetworkPolicy.NONE: + return NetworkPolicy.NONE; } throw new AssertionError("Wrong NetworkPolicy type!"); diff --git a/android/src/com/mapswithme/util/NetworkPolicy.java b/android/src/com/mapswithme/util/NetworkPolicy.java index 47fd43278c..c1ad678e7e 100644 --- a/android/src/com/mapswithme/util/NetworkPolicy.java +++ b/android/src/com/mapswithme/util/NetworkPolicy.java @@ -12,6 +12,7 @@ import java.util.concurrent.TimeUnit; public final class NetworkPolicy { + public static final int NONE = -1; public static final int ASK = 0; public static final int ALWAYS = 1; public static final int NEVER = 2; @@ -21,7 +22,7 @@ public final class NetworkPolicy private static final String TAG_NETWORK_POLICY = "network_policy"; @Retention(RetentionPolicy.SOURCE) - @IntDef({ ASK, ALWAYS, NEVER, NOT_TODAY, TODAY }) + @IntDef({ NONE, ASK, ALWAYS, NEVER, NOT_TODAY, TODAY }) @interface NetworkPolicyDef { } @@ -48,6 +49,7 @@ public final class NetworkPolicy switch (type) { case ASK: + case NONE: showDialog(fragmentManager, listener); break; case ALWAYS: diff --git a/android/src/com/mapswithme/util/statistics/Statistics.java b/android/src/com/mapswithme/util/statistics/Statistics.java index c9448c9ad2..fe5dd92f8a 100644 --- a/android/src/com/mapswithme/util/statistics/Statistics.java +++ b/android/src/com/mapswithme/util/statistics/Statistics.java @@ -6,6 +6,7 @@ import android.location.Location; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.os.Build; +import android.support.annotation.IntDef; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.text.TextUtils; @@ -29,7 +30,10 @@ import com.mapswithme.maps.widget.placepage.Sponsored; import com.mapswithme.util.Config; import com.mapswithme.util.ConnectionState; import com.mapswithme.util.Counters; +import com.my.tracker.MyTracker; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -38,15 +42,20 @@ import java.util.Map; import static com.mapswithme.util.statistics.Statistics.EventName.DOWNLOADER_DIALOG_ERROR; import static com.mapswithme.util.statistics.Statistics.EventName.PP_BANNER_BLANK; import static com.mapswithme.util.statistics.Statistics.EventName.PP_BANNER_ERROR; +import static com.mapswithme.util.statistics.Statistics.EventName.PP_BANNER_SHOW; +import static com.mapswithme.util.statistics.Statistics.EventName.PP_OWNERSHIP_BUTTON_CLICK; import static com.mapswithme.util.statistics.Statistics.EventName.PP_SPONSORED_BOOK; import static com.mapswithme.util.statistics.Statistics.EventParam.BANNER; import static com.mapswithme.util.statistics.Statistics.EventParam.BANNER_STATE; import static com.mapswithme.util.statistics.Statistics.EventParam.ERROR_CODE; import static com.mapswithme.util.statistics.Statistics.EventParam.ERROR_MESSAGE; +import static com.mapswithme.util.statistics.Statistics.EventParam.FEATURE_ID; import static com.mapswithme.util.statistics.Statistics.EventParam.HOTEL; import static com.mapswithme.util.statistics.Statistics.EventParam.HOTEL_LAT; import static com.mapswithme.util.statistics.Statistics.EventParam.HOTEL_LON; import static com.mapswithme.util.statistics.Statistics.EventParam.MAP_DATA_SIZE; +import static com.mapswithme.util.statistics.Statistics.EventParam.MWM_NAME; +import static com.mapswithme.util.statistics.Statistics.EventParam.MWM_VERSION; import static com.mapswithme.util.statistics.Statistics.EventParam.PROVIDER; import static com.mapswithme.util.statistics.Statistics.EventParam.RESTAURANT; import static com.mapswithme.util.statistics.Statistics.EventParam.RESTAURANT_LAT; @@ -54,13 +63,19 @@ import static com.mapswithme.util.statistics.Statistics.EventParam.RESTAURANT_LO import static com.mapswithme.util.statistics.Statistics.EventParam.TYPE; import static com.mapswithme.util.statistics.Statistics.ParamValue.BOOKING_COM; import static com.mapswithme.util.statistics.Statistics.ParamValue.OPENTABLE; -import static com.mapswithme.util.statistics.Statistics.EventName.PP_HOTEL_REVIEWS_LAND; import static com.mapswithme.util.statistics.Statistics.ParamValue.SEARCH_BOOKING_COM; public enum Statistics { INSTANCE; + @Retention(RetentionPolicy.SOURCE) + @IntDef({PP_BANNER_STATE_PREVIEW, PP_BANNER_STATE_DETAILS}) + public @interface BannerState {} + + public static final int PP_BANNER_STATE_PREVIEW = 0; + public static final int PP_BANNER_STATE_DETAILS = 1; + // Statistics counters private int mBookmarksCreated; private int mSharedTimes; @@ -117,6 +132,7 @@ public enum Statistics public static final String PP_HOTEL_REVIEWS_LAND = "PlacePage_Hotel_Reviews_land"; public static final String PP_HOTEL_DESCRIPTION_LAND = "PlacePage_Hotel_Description_land"; public static final String PP_HOTEL_FACILITIES = "PlacePage_Hotel_Facilities_open"; + static final String PP_OWNERSHIP_BUTTON_CLICK = "Placepage_OwnershipButton_click"; // toolbar actions public static final String TOOLBAR_MY_POSITION = "Toolbar. MyPosition"; @@ -238,9 +254,9 @@ public enum Statistics public static final String IS_AUTHENTICATED = "is_authenticated"; public static final String IS_ONLINE = "is_online"; public static final String IS_SUCCESS = "is_success_message"; - public static final String FEATURE_ID = "feature_id"; - public static final String MWM_NAME = "mwm_name"; - public static final String MWM_VERSION = "mwm_version"; + static final String FEATURE_ID = "feature_id"; + static final String MWM_NAME = "mwm_name"; + static final String MWM_VERSION = "mwm_version"; public static final String ERR_TYPE = "error_type"; // (1 - No space left) public static final String ERR_MSG = "error_message"; public static final String ERR_DATA = "err_data"; @@ -533,12 +549,15 @@ public enum Statistics trackHotelEvent(PP_SPONSORED_BOOK, hotel, mapObject); } - public void trackPPBanner(@NonNull String eventName, @NonNull MwmNativeAd ad, int state) + public void trackPPBanner(@NonNull String eventName, @NonNull MwmNativeAd ad, @BannerState int state) { trackEvent(eventName, Statistics.params() .add(BANNER, ad.getBannerId()) .add(PROVIDER, ad.getProvider()) .add(BANNER_STATE, String.valueOf(state))); + + if (!eventName.equals(PP_BANNER_SHOW) || state == PP_BANNER_STATE_PREVIEW) + MyTracker.trackEvent(eventName); } public void trackPPBannerError(@NonNull String bannerId, @NonNull String provider, @@ -553,6 +572,7 @@ public enum Statistics .add(PROVIDER, provider) .add(BANNER_STATE, String.valueOf(state)); trackEvent(eventName, builder.get()); + MyTracker.trackEvent(eventName); } public void trackBookingSearchEvent(@NonNull MapObject mapObject) @@ -579,6 +599,16 @@ public enum Statistics .add(TYPE, error)); } + public void trackPPOwnershipButtonClick(@NonNull MapObject mapObject) + { + trackEvent(PP_OWNERSHIP_BUTTON_CLICK, LocationHelper.INSTANCE.getLastKnownLocation(), + params() + .add(MWM_NAME, mapObject.getMwmName()) + .add(MWM_VERSION, mapObject.getMwmVersion()) + .add(FEATURE_ID, mapObject.getFeatureIndex()) + .get()); + } + public static ParameterBuilder params() { return new ParameterBuilder(); @@ -586,8 +616,8 @@ public enum Statistics public static ParameterBuilder editorMwmParams() { - return params().add(EventParam.MWM_NAME, Editor.nativeGetMwmName()) - .add(EventParam.MWM_VERSION, Editor.nativeGetMwmVersion()); + return params().add(MWM_NAME, Editor.nativeGetMwmName()) + .add(MWM_VERSION, Editor.nativeGetMwmVersion()); } public static class ParameterBuilder diff --git a/base/string_utils.hpp b/base/string_utils.hpp index 8fc2228b40..1ebec6dc13 100644 --- a/base/string_utils.hpp +++ b/base/string_utils.hpp @@ -1,6 +1,7 @@ #pragma once #include "base/buffer_vector.hpp" +#include "base/macros.hpp" #include "base/stl_add.hpp" #include @@ -337,28 +338,29 @@ bool IsInArray(T(&arr)[N], TT const & t) /// @name From string to numeric. //@{ -bool to_int(char const * s, int & i, int base = 10); -bool to_uint(char const * s, unsigned int & i, int base = 10); -bool to_uint64(char const * s, uint64_t & i); -bool to_int64(char const * s, int64_t & i); -bool to_float(char const * s, float & f); -bool to_double(char const * s, double & d); +WARN_UNUSED_RESULT bool to_int(char const * s, int & i, int base = 10); +WARN_UNUSED_RESULT bool to_uint(char const * s, unsigned int & i, int base = 10); +WARN_UNUSED_RESULT bool to_uint64(char const * s, uint64_t & i); +WARN_UNUSED_RESULT bool to_int64(char const * s, int64_t & i); +WARN_UNUSED_RESULT bool to_float(char const * s, float & f); +WARN_UNUSED_RESULT bool to_double(char const * s, double & d); -inline bool is_number(std::string const & s) +WARN_UNUSED_RESULT inline bool is_number(std::string const & s) { int64_t dummy; return to_int64(s.c_str(), dummy); } -inline bool to_int(std::string const & s, int & i, int base = 10) { return to_int(s.c_str(), i, base); } -inline bool to_uint(std::string const & s, unsigned int & i, int base = 10) +WARN_UNUSED_RESULT inline bool to_int(std::string const & s, int & i, int base = 10) { return to_int(s.c_str(), i, base); } +WARN_UNUSED_RESULT inline bool to_uint(std::string const & s, unsigned int & i, int base = 10) { return to_uint(s.c_str(), i, base); } -inline bool to_uint64(std::string const & s, uint64_t & i) { return to_uint64(s.c_str(), i); } -inline bool to_int64(std::string const & s, int64_t & i) { return to_int64(s.c_str(), i); } -inline bool to_float(std::string const & s, float & f) { return to_float(s.c_str(), f); } -inline bool to_double(std::string const & s, double & d) { return to_double(s.c_str(), d); } + +WARN_UNUSED_RESULT inline bool to_uint64(std::string const & s, uint64_t & i) { return to_uint64(s.c_str(), i); } +WARN_UNUSED_RESULT inline bool to_int64(std::string const & s, int64_t & i) { return to_int64(s.c_str(), i); } +WARN_UNUSED_RESULT inline bool to_float(std::string const & s, float & f) { return to_float(s.c_str(), f); } +WARN_UNUSED_RESULT inline bool to_double(std::string const & s, double & d) { return to_double(s.c_str(), d); } //@} /// @name From numeric to string. diff --git a/coding/transliteration.cpp b/coding/transliteration.cpp index 3c391f396a..717b90a4f7 100644 --- a/coding/transliteration.cpp +++ b/coding/transliteration.cpp @@ -83,7 +83,7 @@ bool Transliteration::Transliterate(std::string const & str, int8_t langCode, st { UErrorCode status = U_ZERO_ERROR; - std::string const removeDiacriticRule = ";NFD;[\u02B9-\u02D3\u0301-\u0358]Remove;NFC"; + std::string const removeDiacriticRule = ";NFD;[\u02B9-\u02D3\u0301-\u0358\u00B7\u0027]Remove;NFC"; transliteratorId.append(removeDiacriticRule); UnicodeString translitId(transliteratorId.c_str()); diff --git a/data/World.mwm b/data/World.mwm index d788ff96a5..40d80babcd 100644 Binary files a/data/World.mwm and b/data/World.mwm differ diff --git a/data/WorldCoasts.mwm b/data/WorldCoasts.mwm index 577e381571..85da740788 100644 Binary files a/data/WorldCoasts.mwm and b/data/WorldCoasts.mwm differ diff --git a/data/colors.txt b/data/colors.txt index b1064ed3f7..7413ad97c8 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -106,7 +106,6 @@ 8327953 8355711 8421504 -8853524 8947848 9163744 9210752 diff --git a/data/countries.txt b/data/countries.txt index 3d366d6158..924161fb74 100644 --- a/data/countries.txt +++ b/data/countries.txt @@ -1,10 +1,10 @@ { "id": "Countries", - "v": 170328, + "v": 170511, "g": [ { "id": "Abkhazia", - "s": 5268168, + "s": 4433955, "affiliations": [ "\u0410\u0431\u0445\u0430\u0437\u0438\u044f - \u0410\u04a7\u0441\u043d\u044b", "\u10d0\u10e4\u10ee\u10d0\u10d6\u10d4\u10d7\u10d8\u10e1 \u10d0\u10d5\u10e2\u10dd\u10dc\u10dd\u10db\u10d8\u10e3\u10e0\u10d8 \u10e0\u10d4\u10e1\u10de\u10e3\u10d1\u10da\u10d8\u10d9\u10d0 - \u0410\u04a7\u0441\u043d\u044b \u0410\u0432\u0442\u043e\u043d\u043e\u043c\u0442\u04d9 \u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430", @@ -16,7 +16,7 @@ }, { "id": "Afghanistan", - "s": 29938645, + "s": 17741621, "affiliations": [ "Badakhshan", "Badghis", @@ -60,7 +60,7 @@ }, { "id": "Albania", - "s": 20161938, + "s": 15177654, "affiliations": [ "Shqip\u00ebria" ], @@ -73,7 +73,7 @@ "g": [ { "id": "Algeria_Central", - "s": 34413140, + "s": 14479799, "affiliations": [ "Adrar \u2d30\u2d37\u2d54\u2d30\u2d54 \u0623\u062f\u0631\u0627\u0631", "Illizi \u2d49\u2d4d\u2d4d\u2d49\u2d63\u2d49 \u0625\u0644\u0640\u064a\u0640\u0632\u064a", @@ -100,7 +100,7 @@ }, { "id": "Algeria_Coast", - "s": 87187748, + "s": 43802931, "affiliations": [ "Alger - \u0627\u0644\u062c\u0632\u0627\u0626\u0631", "Alg\u00e9rie \u2d4d\u2d63\u2d63\u2d30\u2d62\u2d3b\u2d54 \u0627\u0644\u062c\u0632\u0627\u0626\u0631", @@ -143,7 +143,7 @@ }, { "id": "Andorra", - "s": 1137809, + "s": 1021873, "affiliations": [ "Andorra" ], @@ -153,7 +153,7 @@ }, { "id": "Angola", - "s": 28048585, + "s": 11262307, "affiliations": [ "Angola", "Bengo", @@ -181,7 +181,7 @@ }, { "id": "Anguilla", - "s": 475162, + "s": 409446, "affiliations": [ "Anguilla" ], @@ -191,7 +191,7 @@ }, { "id": "Antigua and Barbuda", - "s": 1423528, + "s": 777491, "affiliations": [ "Antigua and Barbuda", "Montserrat" @@ -202,7 +202,7 @@ }, { "id": "Barbados", - "s": 2572098, + "s": 1278964, "affiliations": [ "Barbados" ], @@ -212,7 +212,7 @@ }, { "id": "British Virgin Islands", - "s": 494947, + "s": 392954, "affiliations": [ "British Virgin Islands" ], @@ -222,7 +222,7 @@ }, { "id": "Caribisch Nederland", - "s": 6046346, + "s": 4159641, "affiliations": [ "Caribisch Nederland", "Nederland", @@ -236,7 +236,7 @@ }, { "id": "Dominica", - "s": 1883492, + "s": 1598221, "affiliations": [ "Dominica", "Saint Andrew Parish", @@ -256,7 +256,7 @@ }, { "id": "Grenada", - "s": 1282261, + "s": 960516, "affiliations": [ "Grenada" ], @@ -266,7 +266,7 @@ }, { "id": "Guadeloupe", - "s": 13202916, + "s": 11540153, "affiliations": [ "France", "Guadeloupe", @@ -278,7 +278,7 @@ }, { "id": "Martinique", - "s": 11229143, + "s": 9821171, "affiliations": [ "France", "Martinique", @@ -290,7 +290,7 @@ }, { "id": "Montserrat", - "s": 241300, + "s": 196019, "affiliations": [ "Montserrat" ], @@ -300,7 +300,7 @@ }, { "id": "Saint Barthelemy", - "s": 340989, + "s": 257301, "affiliations": [ "France" ], @@ -310,7 +310,7 @@ }, { "id": "Saint Kitts and Nevis", - "s": 695362, + "s": 390885, "affiliations": [ "Saint Kitts and Nevis" ], @@ -320,7 +320,7 @@ }, { "id": "Saint Lucia", - "s": 1650414, + "s": 1355401, "affiliations": [ "Saint Lucia", "Saint Vincent and the Grenadines" @@ -331,7 +331,7 @@ }, { "id": "Saint Martin", - "s": 1577559, + "s": 1317379, "affiliations": [ "Anguilla", "France", @@ -343,7 +343,7 @@ }, { "id": "Saint Vincent and the Grenadines", - "s": 840435, + "s": 653965, "affiliations": [ "Saint Vincent and the Grenadines" ], @@ -353,7 +353,7 @@ }, { "id": "Trinidad and Tobago", - "s": 12778588, + "s": 8759097, "affiliations": [ "Trinidad and Tobago" ], @@ -363,7 +363,7 @@ }, { "id": "United States Virgin Islands", - "s": 1549252, + "s": 1000655, "affiliations": [ "British Virgin Islands", "Puerto Rico", @@ -381,14 +381,14 @@ "g": [ { "id": "Campo de Hielo Sur", - "s": 916911, + "s": 925176, "affiliations": [ "Acuerdo de Campos de Hielo" ] }, { "id": "Argentina_Buenos Aires_Buenos Aires", - "s": 64764461, + "s": 22486295, "affiliations": [ "Argentina", "Ciudad Aut\u00f3noma de Buenos Aires", @@ -400,7 +400,7 @@ }, { "id": "Argentina_Buenos Aires_North", - "s": 21817240, + "s": 8675472, "affiliations": [ "Argentina", "Buenos Aires" @@ -411,7 +411,7 @@ }, { "id": "Argentina_Buenos Aires_South", - "s": 25747544, + "s": 9806455, "affiliations": [ "Argentina", "Buenos Aires" @@ -422,7 +422,7 @@ }, { "id": "Argentina_Patagonia", - "s": 41975572, + "s": 26561198, "affiliations": [ "Argentina", "Chubut", @@ -437,7 +437,7 @@ }, { "id": "Argentina_Cuyo", - "s": 22978117, + "s": 10773696, "affiliations": [ "Argentina", "La Rioja", @@ -451,7 +451,7 @@ }, { "id": "Argentina_Mesopotamia", - "s": 41362049, + "s": 24207032, "affiliations": [ "Argentina", "Corrientes", @@ -472,7 +472,7 @@ }, { "id": "Argentina_Northwest", - "s": 47047119, + "s": 19748196, "affiliations": [ "Chaco", "Argentina", @@ -489,7 +489,7 @@ }, { "id": "Argentina_Pampas", - "s": 38588001, + "s": 13793198, "affiliations": [ "Argentina", "C\u00f3rdoba", @@ -501,7 +501,7 @@ }, { "id": "Argentina_Santa Fe", - "s": 28061335, + "s": 11142043, "affiliations": [ "Argentina", "Santa Fe" @@ -514,7 +514,7 @@ }, { "id": "Armenia", - "s": 18548626, + "s": 12928534, "affiliations": [ "Border Azerbaijan - Armenia (Enclave AZE)", "Qazax rayonu", @@ -540,7 +540,7 @@ "g": [ { "id": "Austria_Burgenland", - "s": 15622233, + "s": 14638366, "affiliations": [ "Burgenland", "\u00d6sterreich" @@ -551,7 +551,7 @@ }, { "id": "Austria_Carinthia", - "s": 37527060, + "s": 32225194, "affiliations": [ "K\u00e4rnten", "\u00d6sterreich" @@ -562,7 +562,7 @@ }, { "id": "Austria_Lower Austria_Wien", - "s": 61425850, + "s": 56116806, "affiliations": [ "\u00d6sterreich", "Nieder\u00f6sterreich", @@ -574,7 +574,7 @@ }, { "id": "Austria_Styria_Graz", - "s": 55364484, + "s": 47668684, "affiliations": [ "\u00d6sterreich", "Steiermark" @@ -585,7 +585,7 @@ }, { "id": "Austria_Styria_Leoben", - "s": 30284372, + "s": 28435971, "affiliations": [ "\u00d6sterreich", "Steiermark" @@ -596,7 +596,7 @@ }, { "id": "Austria_Upper Austria_Linz", - "s": 37950441, + "s": 31681913, "affiliations": [ "\u00d6sterreich", "Ober\u00f6sterreich" @@ -607,7 +607,7 @@ }, { "id": "Austria_Upper Austria_Wels", - "s": 49114071, + "s": 39154574, "affiliations": [ "\u00d6sterreich", "Ober\u00f6sterreich" @@ -618,7 +618,7 @@ }, { "id": "Austria_Lower Austria_West", - "s": 49155444, + "s": 42832995, "affiliations": [ "\u00d6sterreich", "Nieder\u00f6sterreich" @@ -629,7 +629,7 @@ }, { "id": "Austria_Tyrol", - "s": 54193694, + "s": 48491815, "affiliations": [ "\u00d6sterreich", "Tirol" @@ -640,7 +640,7 @@ }, { "id": "Austria_Salzburg", - "s": 34776503, + "s": 30418932, "affiliations": [ "\u00d6sterreich", "Salzburg" @@ -651,7 +651,7 @@ }, { "id": "Austria_Vorarlberg", - "s": 20252567, + "s": 17031681, "affiliations": [ "\u00d6sterreich", "Vorarlberg" @@ -667,7 +667,7 @@ "g": [ { "id": "Willis Island", - "s": 79291, + "s": 79944, "affiliations": [ "Australia", "Coral Sea Islands Territory", @@ -676,7 +676,7 @@ }, { "id": "Australia_Melbourne", - "s": 55441698, + "s": 35636218, "affiliations": [ "Australia", "Victoria" @@ -687,7 +687,7 @@ }, { "id": "Australia_New South Wales", - "s": 33682024, + "s": 25898378, "affiliations": [ "Australia", "Coral Sea Islands Territory", @@ -701,7 +701,7 @@ }, { "id": "Australia_Northern Territory", - "s": 9050938, + "s": 7905517, "affiliations": [ "Australia", "Northern Territory" @@ -712,7 +712,7 @@ }, { "id": "Australia_Queensland", - "s": 24567366, + "s": 20856644, "affiliations": [ "Australia", "Coral Sea Islands Territory", @@ -724,7 +724,7 @@ }, { "id": "Australia_South Australia", - "s": 38441920, + "s": 24808197, "affiliations": [ "Australia", "South Australia" @@ -735,7 +735,7 @@ }, { "id": "Australia_Tasmania", - "s": 21720794, + "s": 20417266, "affiliations": [ "Australia", "Tasmania" @@ -746,7 +746,7 @@ }, { "id": "Australia_Victoria", - "s": 41078451, + "s": 28072024, "affiliations": [ "Australia", "Victoria" @@ -757,7 +757,7 @@ }, { "id": "Australia_Western Australia", - "s": 51172681, + "s": 36462730, "affiliations": [ "Ashmore and Cartier Islands", "Christmas Island", @@ -773,7 +773,7 @@ }, { "id": "Australia_Brisbane", - "s": 44603618, + "s": 28411685, "affiliations": [ "Australia", "Coral Sea Islands Territory", @@ -786,7 +786,7 @@ }, { "id": "Australia_Sydney", - "s": 64585137, + "s": 43895594, "affiliations": [ "Australia", "Australian Capital Territory", @@ -804,7 +804,7 @@ "g": [ { "id": "Nagorno-Karabakh", - "s": 2586428, + "s": 2073355, "affiliations": [ "Az\u0259rbaycan", "\u0544\u0561\u0580\u057f\u0561\u056f\u0565\u0580\u057f\u056b \u0577\u0580\u057b\u0561\u0576 (Martakert Province)", @@ -822,7 +822,7 @@ }, { "id": "Azerbaijan", - "s": 29137435, + "s": 13391849, "affiliations": [ "Ab\u015feron rayonu", "A\u011fcab\u0259di rayonu", @@ -904,7 +904,7 @@ }, { "id": "Bahrain", - "s": 5721465, + "s": 3094411, "affiliations": [ "\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u0645\u062d\u0631\u0642", "\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u0639\u0627\u0635\u0645\u0629", @@ -919,7 +919,7 @@ }, { "id": "Bangladesh", - "s": 27672405, + "s": 23185425, "affiliations": [ "Border India - Bangladesh", "\u09b0\u09be\u099c\u09b6\u09be\u09b9\u09c0 \u09ac\u09bf\u09ad\u09be\u0997", @@ -940,7 +940,7 @@ "g": [ { "id": "Belarus_Vitebsk Region", - "s": 37762223, + "s": 32217176, "affiliations": [ "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c", "\u0412\u0438\u0442\u0435\u0431\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" @@ -951,7 +951,7 @@ }, { "id": "Belarus_Hrodna Region", - "s": 23514270, + "s": 19493491, "affiliations": [ "\u0413\u0440\u043e\u0434\u043d\u0435\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c" @@ -962,7 +962,7 @@ }, { "id": "Belarus_Brest Region", - "s": 20379416, + "s": 15427152, "affiliations": [ "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c", "\u0411\u0440\u0435\u0441\u0442\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c" @@ -973,7 +973,7 @@ }, { "id": "Belarus_Homiel Region", - "s": 26372362, + "s": 21369739, "affiliations": [ "\u0413\u043e\u043c\u0435\u043b\u044c\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c" @@ -984,7 +984,7 @@ }, { "id": "Belarus_Maglieu Region", - "s": 21532293, + "s": 17445073, "affiliations": [ "\u041c\u043e\u0433\u0438\u043b\u0451\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c" @@ -995,7 +995,7 @@ }, { "id": "Belarus_Minsk Region", - "s": 48857619, + "s": 38863279, "affiliations": [ "\u0413\u043e\u043b\u044c\u0444-\u043a\u043b\u0443\u0431", "\u041c\u0438\u043d\u0441\u043a", @@ -1015,7 +1015,7 @@ "g": [ { "id": "Belgium_West Flanders", - "s": 32996978, + "s": 26591384, "affiliations": [ "Belgi\u00eb - Belgique - Belgien", "Vlaanderen" @@ -1027,7 +1027,7 @@ }, { "id": "Belgium_Antwerp", - "s": 45367179, + "s": 40612757, "affiliations": [ "Belgi\u00eb - Belgique - Belgien", "Nederland - Belgique / Belgi\u00eb / Belgien", @@ -1039,7 +1039,7 @@ }, { "id": "Belgium_East Flanders", - "s": 32919500, + "s": 27930155, "affiliations": [ "Belgi\u00eb - Belgique - Belgien", "Vlaanderen" @@ -1050,7 +1050,7 @@ }, { "id": "Belgium_Hainaut", - "s": 23317485, + "s": 18452223, "affiliations": [ "Belgi\u00eb - Belgique - Belgien", "Wallonie" @@ -1061,7 +1061,7 @@ }, { "id": "Belgium_Walloon Brabant", - "s": 7713432, + "s": 6446465, "affiliations": [ "Belgi\u00eb - Belgique - Belgien", "Wallonie" @@ -1072,7 +1072,7 @@ }, { "id": "Belgium_Namur", - "s": 11809592, + "s": 9963240, "affiliations": [ "Belgi\u00eb - Belgique - Belgien", "Wallonie" @@ -1083,7 +1083,7 @@ }, { "id": "Belgium_Limburg", - "s": 27982257, + "s": 23926114, "affiliations": [ "Belgi\u00eb - Belgique - Belgien", "Vlaanderen" @@ -1094,7 +1094,7 @@ }, { "id": "Belgium_Luxembourg", - "s": 13043241, + "s": 11801333, "affiliations": [ "Belgi\u00eb - Belgique - Belgien", "Wallonie" @@ -1105,7 +1105,7 @@ }, { "id": "Belgium_Flemish Brabant", - "s": 47346288, + "s": 41795169, "affiliations": [ "Belgi\u00eb - Belgique - Belgien", "R\u00e9gion de Bruxelles-Capitale - Brussels Hoofdstedelijk Gewest", @@ -1117,7 +1117,7 @@ }, { "id": "Belgium_Liege", - "s": 29827112, + "s": 26241909, "affiliations": [ "Belgi\u00eb - Belgique - Belgien", "Wallonie" @@ -1130,7 +1130,7 @@ }, { "id": "Belize", - "s": 4679235, + "s": 3256887, "affiliations": [ "Belize District", "Belize", @@ -1148,7 +1148,7 @@ }, { "id": "Benin", - "s": 25302747, + "s": 14457342, "affiliations": [ "Alibori", "Atakora", @@ -1170,7 +1170,7 @@ }, { "id": "Bermuda", - "s": 989516, + "s": 657903, "affiliations": [ "Bermuda" ], @@ -1180,7 +1180,7 @@ }, { "id": "Bhutan", - "s": 3938962, + "s": 3680245, "affiliations": [ "\u0f60\u0f56\u0fb2\u0f74\u0f42\u0f61\u0f74\u0f63\u0f0b", "\u0f58\u0f42\u0f62\u0f0b\u0f66\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b", @@ -1213,7 +1213,7 @@ "g": [ { "id": "Bolivia_North", - "s": 50950538, + "s": 27612930, "affiliations": [ "Bolivia", "Beni", @@ -1227,7 +1227,7 @@ }, { "id": "Bolivia_South", - "s": 38691275, + "s": 25458414, "affiliations": [ "Bolivia", "Chuquisaca", @@ -1247,7 +1247,7 @@ "g": [ { "id": "Bosnia and Herzegovina_Entity Federation of Bosnia and Herzegovina", - "s": 41289080, + "s": 36025525, "affiliations": [ "Bosna i Hercegovina", "Federacija Bosne i Hercegovine" @@ -1258,7 +1258,7 @@ }, { "id": "Bosnia and Herzegovina_Brcko district of Bosnia and Herzegowina", - "s": 898876, + "s": 776826, "affiliations": [ "Br\u010dko distrikt Bosne i Hercegovine", "Bosna i Hercegovina", @@ -1270,7 +1270,7 @@ }, { "id": "Bosnia and Herzegovina_Republic of Srpska", - "s": 35311971, + "s": 33075358, "affiliations": [ "Bosna i Hercegovina", "Republika Srpska" @@ -1283,7 +1283,7 @@ }, { "id": "Botswana", - "s": 37850235, + "s": 27017602, "affiliations": [ "Botswana", "Central District", @@ -1305,7 +1305,7 @@ "g": [ { "id": "Brazil_Bahia", - "s": 58578495, + "s": 21295953, "affiliations": [ "Bahia", "Brasil" @@ -1316,7 +1316,7 @@ }, { "id": "Brazil_Goias_North", - "s": 15237475, + "s": 7707803, "affiliations": [ "Brasil", "Goi\u00e1s" @@ -1327,7 +1327,7 @@ }, { "id": "Brazil_Goias_Brasilia", - "s": 48485700, + "s": 16091695, "affiliations": [ "Brasil", "Distrito Federal", @@ -1339,7 +1339,7 @@ }, { "id": "Brazil_Mato Grosso Do Sul", - "s": 22482630, + "s": 7806550, "affiliations": [ "Brasil", "Mato Grosso do Sul" @@ -1350,7 +1350,7 @@ }, { "id": "Brazil_Mato Grosso", - "s": 28210083, + "s": 13044815, "affiliations": [ "Brasil", "Mato Grosso" @@ -1361,7 +1361,7 @@ }, { "id": "Brazil_North Region_East", - "s": 47132247, + "s": 22141602, "affiliations": [ "Amap\u00e1", "Brasil", @@ -1374,7 +1374,7 @@ }, { "id": "Brazil_North Region_West", - "s": 35442674, + "s": 20019821, "affiliations": [ "Acre", "Amazonas", @@ -1388,7 +1388,7 @@ }, { "id": "Brazil_Northeast Region_East", - "s": 44756732, + "s": 18631649, "affiliations": [ "Alagoas", "Brasil", @@ -1401,7 +1401,7 @@ }, { "id": "Brazil_Northeast Region_West", - "s": 76087700, + "s": 24063893, "affiliations": [ "Brasil", "Cear\u00e1", @@ -1415,7 +1415,7 @@ }, { "id": "Brazil_Paraiba", - "s": 17832601, + "s": 8236158, "affiliations": [ "Brasil", "Para\u00edba" @@ -1426,7 +1426,7 @@ }, { "id": "Brazil_Parana_East", - "s": 32867745, + "s": 14873954, "affiliations": [ "Brasil", "Paran\u00e1" @@ -1437,7 +1437,7 @@ }, { "id": "Brazil_Parana_West", - "s": 48766176, + "s": 22826406, "affiliations": [ "Brasil", "Paran\u00e1" @@ -1448,7 +1448,7 @@ }, { "id": "Brazil_Rio Grande do Norte", - "s": 14021027, + "s": 4903274, "affiliations": [ "Brasil", "Pernambuco", @@ -1460,7 +1460,7 @@ }, { "id": "Brazil_Santa Catarina", - "s": 57191666, + "s": 32842672, "affiliations": [ "Brasil", "Santa Catarina" @@ -1471,7 +1471,7 @@ }, { "id": "Brazil_South Region_East", - "s": 58223736, + "s": 34855412, "affiliations": [ "Brasil", "Rio Grande do Sul" @@ -1482,7 +1482,7 @@ }, { "id": "Brazil_South Region_West", - "s": 37667859, + "s": 23356578, "affiliations": [ "Brasil", "Rio Grande do Sul" @@ -1493,7 +1493,7 @@ }, { "id": "Brazil_Southeast Region_Espirito Santo", - "s": 26358651, + "s": 15752488, "affiliations": [ "Brasil", "Esp\u00edrito Santo" @@ -1504,7 +1504,7 @@ }, { "id": "Brazil_Southeast Region_Minas Gerais_Contagem", - "s": 70673859, + "s": 30170924, "affiliations": [ "Brasil", "Minas Gerais" @@ -1515,7 +1515,7 @@ }, { "id": "Brazil_Southeast Region_Minas Gerais_North", - "s": 50292742, + "s": 24279332, "affiliations": [ "Brasil", "Minas Gerais" @@ -1526,7 +1526,7 @@ }, { "id": "Brazil_Southeast Region_Rio de Janeiro", - "s": 55229370, + "s": 26914310, "affiliations": [ "Brasil", "Rio de Janeiro" @@ -1537,7 +1537,7 @@ }, { "id": "Brazil_Southeast Region_Sao Paulo_Campinas", - "s": 60324126, + "s": 22989201, "affiliations": [ "Brasil", "S\u00e3o Paulo" @@ -1548,7 +1548,7 @@ }, { "id": "Brazil_Southeast Region_Sao Paulo_City", - "s": 82582657, + "s": 43718529, "affiliations": [ "Brasil", "S\u00e3o Paulo" @@ -1559,7 +1559,7 @@ }, { "id": "Brazil_Southeast Region_Sao Paulo_West", - "s": 54385945, + "s": 19524393, "affiliations": [ "Brasil", "S\u00e3o Paulo" @@ -1572,7 +1572,7 @@ }, { "id": "Brunei", - "s": 2407411, + "s": 1731176, "affiliations": [ "Brunei Darussalam" ], @@ -1585,7 +1585,7 @@ "g": [ { "id": "Bulgaria_East", - "s": 41707003, + "s": 26564628, "affiliations": [ "\u0411\u044a\u043b\u0433\u0430\u0440\u0438\u044f" ], @@ -1595,7 +1595,7 @@ }, { "id": "Bulgaria_West", - "s": 60895206, + "s": 43389594, "affiliations": [ "\u0411\u044a\u043b\u0433\u0430\u0440\u0438\u044f" ], @@ -1607,7 +1607,7 @@ }, { "id": "Burkina Faso", - "s": 33533329, + "s": 19602118, "affiliations": [ "Boucle du Mouhoun", "Burkina Faso", @@ -1630,7 +1630,7 @@ }, { "id": "Burundi", - "s": 10175125, + "s": 7219314, "affiliations": [ "Cibitoke", "Bubanza", @@ -1657,7 +1657,7 @@ }, { "id": "Cambodia", - "s": 15383486, + "s": 9770279, "affiliations": [ "Bantey Meanchey", "Battambang", @@ -1695,7 +1695,7 @@ "g": [ { "id": "Cameroon_Central", - "s": 60962056, + "s": 53762141, "affiliations": [ "Adamaoua", "Cameroun", @@ -1711,7 +1711,7 @@ }, { "id": "Cameroon_West", - "s": 42464655, + "s": 36972576, "affiliations": [ "Cameroun", "Littoral", @@ -1733,7 +1733,7 @@ "g": [ { "id": "Canada_Alberta_Edmonton", - "s": 75444767, + "s": 57146543, "affiliations": [ "Alberta", "Canada" @@ -1744,7 +1744,7 @@ }, { "id": "Canada_Alberta_North", - "s": 29414406, + "s": 25422606, "affiliations": [ "Alberta", "Canada" @@ -1755,7 +1755,7 @@ }, { "id": "Canada_Alberta_South", - "s": 38164502, + "s": 23924523, "affiliations": [ "Alberta", "Canada" @@ -1771,7 +1771,7 @@ "g": [ { "id": "Canada_British Columbia_Central", - "s": 47296988, + "s": 46189815, "affiliations": [ "British Columbia", "Canada" @@ -1782,7 +1782,7 @@ }, { "id": "Canada_British Columbia_Far_North", - "s": 26770373, + "s": 26244203, "affiliations": [ "British Columbia", "Canada" @@ -1793,7 +1793,7 @@ }, { "id": "Canada_British Columbia_Islands", - "s": 39760059, + "s": 36724467, "affiliations": [ "British Columbia", "Canada" @@ -1804,7 +1804,7 @@ }, { "id": "Canada_British Columbia_North", - "s": 41117037, + "s": 40770743, "affiliations": [ "British Columbia", "Canada" @@ -1815,7 +1815,7 @@ }, { "id": "Canada_British Columbia_Northeast", - "s": 45928840, + "s": 45863134, "affiliations": [ "British Columbia", "Canada" @@ -1826,7 +1826,7 @@ }, { "id": "Canada_British Columbia_Southeast", - "s": 51846755, + "s": 47719210, "affiliations": [ "British Columbia", "Canada" @@ -1837,7 +1837,7 @@ }, { "id": "Canada_British Columbia_Vancouver", - "s": 51828187, + "s": 40473303, "affiliations": [ "British Columbia", "Canada" @@ -1853,7 +1853,7 @@ "g": [ { "id": "Canada_Labrador_North", - "s": 47627034, + "s": 47611986, "affiliations": [ "Canada", "Newfoundland and Labrador", @@ -1865,7 +1865,7 @@ }, { "id": "Canada_Labrador_South", - "s": 36526481, + "s": 36486642, "affiliations": [ "Canada", "Newfoundland and Labrador" @@ -1876,7 +1876,7 @@ }, { "id": "Canada_Labrador_West", - "s": 49204819, + "s": 49133163, "affiliations": [ "Canada", "Newfoundland and Labrador" @@ -1892,7 +1892,7 @@ "g": [ { "id": "Canada_Manitoba_Northeast", - "s": 35249094, + "s": 35098243, "affiliations": [ "Canada", "Manitoba", @@ -1905,7 +1905,7 @@ }, { "id": "Canada_Manitoba_Northwest", - "s": 39439499, + "s": 39237195, "affiliations": [ "Canada", "Manitoba" @@ -1916,7 +1916,7 @@ }, { "id": "Canada_Manitoba_South", - "s": 42206781, + "s": 38752323, "affiliations": [ "Canada", "Manitoba" @@ -1927,7 +1927,7 @@ }, { "id": "Canada_Manitoba_Winnipeg", - "s": 40484672, + "s": 31976059, "affiliations": [ "Canada", "Manitoba" @@ -1940,7 +1940,7 @@ }, { "id": "Canada_New Brunswick", - "s": 50173839, + "s": 45662295, "affiliations": [ "Canada", "Devon Indian Reserve NO. 30", @@ -1956,7 +1956,7 @@ "g": [ { "id": "Canada_Newfoundland_East", - "s": 20489455, + "s": 18874149, "affiliations": [ "Canada", "Newfoundland and Labrador" @@ -1967,7 +1967,7 @@ }, { "id": "Canada_Newfoundland_North", - "s": 27235623, + "s": 26882205, "affiliations": [ "Canada", "Newfoundland and Labrador" @@ -1978,7 +1978,7 @@ }, { "id": "Canada_Newfoundland_South", - "s": 18191186, + "s": 18009088, "affiliations": [ "Canada", "France", @@ -1992,7 +1992,7 @@ }, { "id": "Canada_Newfoundland_West", - "s": 21118174, + "s": 21018565, "affiliations": [ "Canada", "Newfoundland and Labrador" @@ -2008,7 +2008,7 @@ "g": [ { "id": "Canada_Northwest Territories_East", - "s": 16748024, + "s": 16787874, "affiliations": [ "Canada", "Northwest Territories" @@ -2019,7 +2019,7 @@ }, { "id": "Canada_Northwest Territories_North", - "s": 29310970, + "s": 29183301, "affiliations": [ "Canada", "Northwest Territories" @@ -2030,7 +2030,7 @@ }, { "id": "Canada_Northwest Territories_Yellowknife", - "s": 42585648, + "s": 42389657, "affiliations": [ "Canada", "Northwest Territories" @@ -2046,7 +2046,7 @@ "g": [ { "id": "Canada_Nova Scotia_Halifax", - "s": 48469133, + "s": 45760509, "affiliations": [ "Canada", "Nova Scotia" @@ -2057,7 +2057,7 @@ }, { "id": "Canada_Nova Scotia_Sydney", - "s": 20020945, + "s": 18781697, "affiliations": [ "Canada", "Nova Scotia", @@ -2074,7 +2074,7 @@ "g": [ { "id": "Canada_Nunavut_North", - "s": 35078373, + "s": 35031531, "affiliations": [ "Canada", "\u14c4\u14c7\u1557\u1466 Nunavut" @@ -2085,7 +2085,7 @@ }, { "id": "Canada_Nunavut_South", - "s": 75778185, + "s": 75579316, "affiliations": [ "Canada", "\u14c4\u14c7\u1557\u1466 Nunavut" @@ -2101,7 +2101,7 @@ "g": [ { "id": "Canada_Ontario_Bame", - "s": 48506117, + "s": 44482208, "affiliations": [ "Canada", "Ontario" @@ -2112,7 +2112,7 @@ }, { "id": "Canada_Ontario_Kingston", - "s": 73537954, + "s": 65638336, "affiliations": [ "Canada", "Ontario" @@ -2123,7 +2123,7 @@ }, { "id": "Canada_Ontario_London", - "s": 54262837, + "s": 40967062, "affiliations": [ "Canada", "Ontario" @@ -2134,7 +2134,7 @@ }, { "id": "Canada_Ontario_Northeastern_Central", - "s": 32856734, + "s": 32288800, "affiliations": [ "Canada", "Ontario" @@ -2145,7 +2145,7 @@ }, { "id": "Canada_Ontario_Northeastern_North", - "s": 36877279, + "s": 36729149, "affiliations": [ "Canada", "Ontario", @@ -2158,7 +2158,7 @@ }, { "id": "Canada_Ontario_Northeastern_S", - "s": 36463042, + "s": 35585477, "affiliations": [ "Canada", "Ontario" @@ -2169,7 +2169,7 @@ }, { "id": "Canada_Ontario_Northeastern_SE", - "s": 20752782, + "s": 19959053, "affiliations": [ "Canada", "Ontario" @@ -2180,7 +2180,7 @@ }, { "id": "Canada_Ontario_Northeastern_SW", - "s": 40542892, + "s": 39834889, "affiliations": [ "Canada", "Ontario" @@ -2191,7 +2191,7 @@ }, { "id": "Canada_Ontario_Northeastern_Wawa", - "s": 30841459, + "s": 30756470, "affiliations": [ "Canada", "Ontario" @@ -2202,7 +2202,7 @@ }, { "id": "Canada_Ontario_Northern", - "s": 42236882, + "s": 41462816, "affiliations": [ "Canada", "Ontario" @@ -2213,7 +2213,7 @@ }, { "id": "Canada_Ontario_Northwestern", - "s": 81845108, + "s": 80445239, "affiliations": [ "Canada", "NU", @@ -2227,7 +2227,7 @@ }, { "id": "Canada_Ontario_Toronto", - "s": 76954552, + "s": 53128552, "affiliations": [ "Canada", "Ontario" @@ -2240,7 +2240,7 @@ }, { "id": "Canada_Prince Edward Island", - "s": 8000406, + "s": 6984555, "affiliations": [ "Canada", "Prince Edward Island" @@ -2254,7 +2254,7 @@ "g": [ { "id": "Canada_Quebec_Quebec", - "s": 52027944, + "s": 43364054, "affiliations": [ "Canada", "Qu\u00e9bec" @@ -2265,7 +2265,7 @@ }, { "id": "Canada_Quebek_Far North", - "s": 45915714, + "s": 46130121, "affiliations": [ "Canada", "NU", @@ -2279,7 +2279,7 @@ }, { "id": "Canada_Quebek_Montreal", - "s": 43006224, + "s": 29615574, "affiliations": [ "Canada", "Qu\u00e9bec" @@ -2290,7 +2290,7 @@ }, { "id": "Canada_Quebek_Lachute", - "s": 43625922, + "s": 38541259, "affiliations": [ "Canada", "Qu\u00e9bec" @@ -2301,7 +2301,7 @@ }, { "id": "Canada_Quebek_North", - "s": 50612891, + "s": 52668775, "affiliations": [ "Canada", "Qu\u00e9bec" @@ -2312,7 +2312,7 @@ }, { "id": "Canada_Quebek_Southeast_Rimouski", - "s": 20831963, + "s": 19346369, "affiliations": [ "Canada", "Qu\u00e9bec" @@ -2323,7 +2323,7 @@ }, { "id": "Canada_Quebek_Southeast_Saguenay", - "s": 39256398, + "s": 37884113, "affiliations": [ "Canada", "Qu\u00e9bec" @@ -2334,7 +2334,7 @@ }, { "id": "Canada_Quebek_West_Chibougamau", - "s": 49350088, + "s": 49164526, "affiliations": [ "Canada", "Qu\u00e9bec" @@ -2345,7 +2345,7 @@ }, { "id": "Canada_Quebek_West_Rouyn-Noranda", - "s": 33525381, + "s": 32778065, "affiliations": [ "Canada", "Qu\u00e9bec" @@ -2361,7 +2361,7 @@ "g": [ { "id": "Canada_Saskatchewan_North", - "s": 34779469, + "s": 32887598, "affiliations": [ "Canada", "Saskatchewan" @@ -2372,7 +2372,7 @@ }, { "id": "Canada_Saskatchewan_Saskatoon", - "s": 31441053, + "s": 21492452, "affiliations": [ "Canada", "Saskatchewan" @@ -2383,7 +2383,7 @@ }, { "id": "Canada_Saskatchewan_Regina", - "s": 44581822, + "s": 33539764, "affiliations": [ "Canada", "Saskatchewan" @@ -2399,7 +2399,7 @@ "g": [ { "id": "Canada_Yukon_North", - "s": 29183694, + "s": 29039913, "affiliations": [ "Canada", "Yukon" @@ -2410,7 +2410,7 @@ }, { "id": "Canada_Yukon_Whitehorse", - "s": 35635903, + "s": 35373565, "affiliations": [ "Canada", "Yukon" @@ -2425,7 +2425,7 @@ }, { "id": "Cape Verde", - "s": 4028229, + "s": 3359323, "affiliations": [ "Cabo Verde" ], @@ -2435,7 +2435,7 @@ }, { "id": "Cayman Islands", - "s": 1290604, + "s": 923403, "affiliations": [ "Cayman Islands" ], @@ -2445,7 +2445,7 @@ }, { "id": "Central African Republic", - "s": 18681807, + "s": 17357766, "affiliations": [ "Bamingui-Bangoran", "Basse-Kotto", @@ -2471,7 +2471,7 @@ }, { "id": "Chad", - "s": 19090769, + "s": 14577223, "affiliations": [ "Bahr el Gazel", "Batha", @@ -2506,7 +2506,7 @@ "g": [ { "id": "Colombia_North", - "s": 60867618, + "s": 33715827, "affiliations": [ "Bol\u00edvar", "Antioquia", @@ -2528,7 +2528,7 @@ }, { "id": "Colombia_West", - "s": 58435056, + "s": 35766105, "affiliations": [ "Cauca", "Bogot\u00e1", @@ -2551,7 +2551,7 @@ }, { "id": "Colombia_East", - "s": 15143681, + "s": 12771547, "affiliations": [ "Amazonas", "Arauca", @@ -2573,7 +2573,7 @@ }, { "id": "Comoros", - "s": 1567175, + "s": 1254200, "affiliations": [ "Komori", "Ngazidja", @@ -2586,7 +2586,7 @@ }, { "id": "Congo-Brazzaville", - "s": 14967876, + "s": 4663880, "affiliations": [ "Bouenza", "Brazzaville", @@ -2611,7 +2611,7 @@ "g": [ { "id": "Congo-Kinshasa_West", - "s": 66982878, + "s": 44917364, "affiliations": [ "Bas-Uele", "Haut-Katanga", @@ -2645,7 +2645,7 @@ }, { "id": "Congo-Kinshasa_Kivu", - "s": 25798635, + "s": 21270241, "affiliations": [ "R\u00e9publique d\u00e9mocratique du Congo", "Nord-Kivu", @@ -2659,7 +2659,7 @@ }, { "id": "Cook Islands", - "s": 583641, + "s": 526385, "affiliations": [ "Cook Islands" ], @@ -2669,7 +2669,7 @@ }, { "id": "Costa Rica", - "s": 21910397, + "s": 13306330, "affiliations": [ "Alajuela", "Cartago", @@ -2691,7 +2691,7 @@ "g": [ { "id": "Croatia_Central", - "s": 39762463, + "s": 32545520, "affiliations": [ "Hrvatska" ], @@ -2701,7 +2701,7 @@ }, { "id": "Croatia_West", - "s": 57291281, + "s": 51249385, "affiliations": [ "Hrvatska", "Italia" @@ -2714,7 +2714,7 @@ }, { "id": "Cuba", - "s": 43574972, + "s": 23974056, "affiliations": [ "Artemisa", "Ciego de \u00c1vila", @@ -2738,7 +2738,7 @@ }, { "id": "Cyprus", - "s": 16370318, + "s": 9395596, "affiliations": [ "British Sovereign Base Areas", "\u039a\u03cd\u03c0\u03c1\u03bf\u03c2 - K\u0131br\u0131s" @@ -2752,7 +2752,7 @@ "g": [ { "id": "Czech_Praha", - "s": 25268144, + "s": 22949782, "affiliations": [ "Praha", "\u010cesko" @@ -2763,7 +2763,7 @@ }, { "id": "Czech_Severovychod_Pardubicky kraj", - "s": 31525716, + "s": 29956455, "affiliations": [ "Severov\u00fdchod", "\u010cesko" @@ -2774,7 +2774,7 @@ }, { "id": "Czech_Karlovasky kraj", - "s": 16426209, + "s": 15649791, "affiliations": [ "Severoz\u00e1pad", "\u010cesko" @@ -2785,7 +2785,7 @@ }, { "id": "Czech_Ustecky kraj", - "s": 39971839, + "s": 37473432, "affiliations": [ "Severoz\u00e1pad", "\u010cesko" @@ -2796,7 +2796,7 @@ }, { "id": "Czech_Jihozapad_Plzensky kraj", - "s": 41178231, + "s": 39259538, "affiliations": [ "Jihoz\u00e1pad", "\u010cesko" @@ -2807,7 +2807,7 @@ }, { "id": "Czech_Severovychod_Kralovehradecky kraj", - "s": 35547900, + "s": 33802210, "affiliations": [ "Severov\u00fdchod", "\u010cesko" @@ -2818,7 +2818,7 @@ }, { "id": "Czech_Olomoucky kraj", - "s": 33829508, + "s": 32448750, "affiliations": [ "St\u0159edn\u00ed Morava", "\u010cesko" @@ -2829,7 +2829,7 @@ }, { "id": "Czech_Zlinsky Kraj", - "s": 31203704, + "s": 29546695, "affiliations": [ "St\u0159edn\u00ed Morava", "\u010cesko" @@ -2840,7 +2840,7 @@ }, { "id": "Czech_Stredni Cechy_East", - "s": 50100616, + "s": 47180370, "affiliations": [ "St\u0159edn\u00ed \u010cechy", "\u010cesko" @@ -2851,7 +2851,7 @@ }, { "id": "Czech_Jihozapad_Jihocesky kraj", - "s": 57544653, + "s": 55458718, "affiliations": [ "Jihoz\u00e1pad", "\u010cesko" @@ -2862,7 +2862,7 @@ }, { "id": "Czech_Jihovychod_Kraj Vysocina", - "s": 45758631, + "s": 43313874, "affiliations": [ "Jihov\u00fdchod", "\u010cesko" @@ -2873,7 +2873,7 @@ }, { "id": "Czech_Severovychod_Liberecky kraj", - "s": 27675971, + "s": 26133173, "affiliations": [ "Severov\u00fdchod", "\u010cesko" @@ -2884,7 +2884,7 @@ }, { "id": "Czech_Stredni Cechy_West", - "s": 38543780, + "s": 36829451, "affiliations": [ "St\u0159edn\u00ed \u010cechy", "\u010cesko" @@ -2895,7 +2895,7 @@ }, { "id": "Czech_Moravskoslezsko", - "s": 49564679, + "s": 45863413, "affiliations": [ "Moravskoslezsko", "\u010cesko" @@ -2906,7 +2906,7 @@ }, { "id": "Czech_Jihovychod_Jihomoravsky kraj", - "s": 55749514, + "s": 53117068, "affiliations": [ "Jihov\u00fdchod", "\u010cesko" @@ -2919,7 +2919,7 @@ }, { "id": "Cote dIvoire", - "s": 23838904, + "s": 15064717, "affiliations": [ "Abidjan", "Bas-Sassandra", @@ -2946,7 +2946,7 @@ "g": [ { "id": "Denmark_North Denmark Region", - "s": 39385780, + "s": 32008879, "affiliations": [ "Danmark", "Region Nordjylland" @@ -2957,7 +2957,7 @@ }, { "id": "Denmark_Central Denmark Region", - "s": 69589894, + "s": 55377656, "affiliations": [ "Danmark", "Region Midtjylland" @@ -2968,7 +2968,7 @@ }, { "id": "Denmark_Capital Region of Denmark", - "s": 49930295, + "s": 41646898, "affiliations": [ "Danmark", "Region Hovedstaden", @@ -2980,7 +2980,7 @@ }, { "id": "Denmark_Region Zealand", - "s": 44673409, + "s": 36302639, "affiliations": [ "Danmark", "Region Sj\u00e6lland" @@ -2991,7 +2991,7 @@ }, { "id": "Denmark_Region of Southern Denmark", - "s": 77627349, + "s": 63391408, "affiliations": [ "Danmark", "Region Syddanmark" @@ -3004,7 +3004,7 @@ }, { "id": "Djibouti", - "s": 2028695, + "s": 1014509, "affiliations": [ "Ali Sabieh", "Arta", @@ -3020,7 +3020,7 @@ }, { "id": "Dominican Republic", - "s": 29330742, + "s": 11484270, "affiliations": [ "Azua", "Baoruco", @@ -3062,7 +3062,7 @@ }, { "id": "East Timor", - "s": 3366353, + "s": 3022317, "affiliations": [ "Aileu", "Ainaro", @@ -3091,14 +3091,14 @@ "g": [ { "id": "Campo de Hielo Sur", - "s": 916911, + "s": 925176, "affiliations": [ "Acuerdo de Campos de Hielo" ] }, { "id": "Chile_Central", - "s": 63286262, + "s": 36837772, "affiliations": [ "Chile", "Islote Gaviota", @@ -3115,7 +3115,7 @@ }, { "id": "Chile_North", - "s": 19476776, + "s": 12483685, "affiliations": [ "Chile", "I Regi\u00f3n de Tarapac\u00e1", @@ -3131,7 +3131,7 @@ }, { "id": "Chile_South", - "s": 71169839, + "s": 58335540, "affiliations": [ "Chile", "IX Regi\u00f3n de la Araucan\u00eda", @@ -3152,7 +3152,7 @@ "g": [ { "id": "Ecuador_East", - "s": 36154378, + "s": 21056757, "affiliations": [ "Azuay", "Carchi", @@ -3177,7 +3177,7 @@ }, { "id": "Ecuador_West", - "s": 50645261, + "s": 27660746, "affiliations": [ "Bol\u00edvar", "Azuay", @@ -3206,7 +3206,7 @@ }, { "id": "Egypt", - "s": 118882967, + "s": 42220955, "affiliations": [ "\u062f\u0645\u064a\u0627\u0637\u200e\u200e", "\u200f\u0645\u062d\u0627\u0641\u0638\u0629 \u0628\u0646\u0649 \u0633\u0648\u064a\u0641", @@ -3242,7 +3242,7 @@ }, { "id": "El Salvador", - "s": 16382983, + "s": 8211829, "affiliations": [ "Departamento de Cuscatl\u00e1n", "Departamento de La Libertad", @@ -3266,7 +3266,7 @@ }, { "id": "Equatorial Guinea", - "s": 1522940, + "s": 1130084, "affiliations": [ "Centro Sur", "Annob\u00f3n", @@ -3283,7 +3283,7 @@ }, { "id": "Eritrea", - "s": 4924018, + "s": 2429673, "affiliations": [ "Debub", "Debubawi Kayih Bahri", @@ -3302,7 +3302,7 @@ "g": [ { "id": "Estonia_West", - "s": 34116855, + "s": 30419501, "affiliations": [ "Eesti" ], @@ -3312,7 +3312,7 @@ }, { "id": "Estonia_East", - "s": 38806927, + "s": 35192011, "affiliations": [ "Eesti" ], @@ -3324,7 +3324,7 @@ }, { "id": "Ethiopia", - "s": 43628727, + "s": 24535992, "affiliations": [ "Addis Abeba", "Afar", @@ -3347,7 +3347,7 @@ }, { "id": "Faroe Islands", - "s": 2096189, + "s": 1848467, "affiliations": [ "Eysturoyar s\u00fdsla", "F\u00f8royar", @@ -3364,7 +3364,7 @@ }, { "id": "Federated States of Micronesia", - "s": 1154855, + "s": 1117252, "affiliations": [ "Chuuk", "Federated States of Micronesia", @@ -3379,7 +3379,7 @@ }, { "id": "Fiji", - "s": 6696487, + "s": 5779394, "affiliations": [ "Central", "Eastern", @@ -3395,7 +3395,7 @@ "g": [ { "id": "Finland_Western Finland_Jyvaskyla", - "s": 22857007, + "s": 19984845, "affiliations": [ "L\u00e4nsi-Suomi", "Suomi" @@ -3406,7 +3406,7 @@ }, { "id": "Finland_Western Finland_Tampere", - "s": 47104866, + "s": 37827904, "affiliations": [ "L\u00e4nsi-Suomi", "Suomi" @@ -3417,7 +3417,7 @@ }, { "id": "Finland_Northern Finland", - "s": 44615876, + "s": 38504168, "affiliations": [ "Pohjois-Suomi", "Suomi" @@ -3428,7 +3428,7 @@ }, { "id": "Finland_Eastern Finland_North", - "s": 26697246, + "s": 23976278, "affiliations": [ "It\u00e4-Suomi", "Suomi" @@ -3439,7 +3439,7 @@ }, { "id": "Finland_Eastern Finland_South", - "s": 33113569, + "s": 30135338, "affiliations": [ "It\u00e4-Suomi", "Suomi" @@ -3450,7 +3450,7 @@ }, { "id": "Finland_Southern Finland_West", - "s": 27245186, + "s": 22705018, "affiliations": [ "Etel\u00e4-Suomi", "Suomi", @@ -3462,7 +3462,7 @@ }, { "id": "Finland_Southern Finland_Helsinki", - "s": 65079738, + "s": 54116154, "affiliations": [ "Etel\u00e4-Suomi", "Suomi" @@ -3473,7 +3473,7 @@ }, { "id": "Finland_Southern Finland_Lappeenranta", - "s": 34461994, + "s": 33159731, "affiliations": [ "Etel\u00e4-Suomi", "Suomi" @@ -3492,7 +3492,7 @@ "g": [ { "id": "France_Alsace_Bas-Rhin", - "s": 44997594, + "s": 40701931, "affiliations": [ "Alsace-Champagne-Ardenne-Lorraine", "France" @@ -3503,7 +3503,7 @@ }, { "id": "France_Alsace_Haut-Rhin", - "s": 34318356, + "s": 30576044, "affiliations": [ "Alsace-Champagne-Ardenne-Lorraine", "France" @@ -3519,7 +3519,7 @@ "g": [ { "id": "France_Aquitaine_Dordogne", - "s": 31635031, + "s": 25889446, "affiliations": [ "Aquitaine-Limousin-Poitou-Charentes", "France" @@ -3530,7 +3530,7 @@ }, { "id": "France_Aquitaine_Gironde", - "s": 59906952, + "s": 51137997, "affiliations": [ "Aquitaine-Limousin-Poitou-Charentes", "France" @@ -3541,7 +3541,7 @@ }, { "id": "France_Aquitaine_Landes", - "s": 26636017, + "s": 23484731, "affiliations": [ "Aquitaine-Limousin-Poitou-Charentes", "France" @@ -3552,7 +3552,7 @@ }, { "id": "France_Aquitaine_Lot-et-Garonne", - "s": 23199528, + "s": 19387918, "affiliations": [ "Aquitaine-Limousin-Poitou-Charentes", "France" @@ -3563,7 +3563,7 @@ }, { "id": "France_Aquitaine_Pyrenees-Atlantiques", - "s": 36426555, + "s": 31744710, "affiliations": [ "Aquitaine-Limousin-Poitou-Charentes", "France" @@ -3579,7 +3579,7 @@ "g": [ { "id": "France_Auvergne_Allier", - "s": 25186111, + "s": 21629199, "affiliations": [ "Auvergne-Rh\u00f4ne-Alpes", "France" @@ -3590,7 +3590,7 @@ }, { "id": "France_Auvergne_Cantal", - "s": 14570551, + "s": 12420745, "affiliations": [ "Auvergne-Rh\u00f4ne-Alpes", "France" @@ -3601,7 +3601,7 @@ }, { "id": "France_Auvergne_Haute-Loire", - "s": 17788730, + "s": 15773346, "affiliations": [ "Auvergne-Rh\u00f4ne-Alpes", "France" @@ -3612,7 +3612,7 @@ }, { "id": "France_Auvergne_Puy-de-Dome", - "s": 38796681, + "s": 33062543, "affiliations": [ "Auvergne-Rh\u00f4ne-Alpes", "France" @@ -3628,7 +3628,7 @@ "g": [ { "id": "France_Brittany_Cotes-dArmor", - "s": 41160349, + "s": 34527315, "affiliations": [ "Bretagne", "France", @@ -3641,7 +3641,7 @@ }, { "id": "France_Brittany_Finistere", - "s": 57912449, + "s": 49570107, "affiliations": [ "Bretagne", "France" @@ -3652,7 +3652,7 @@ }, { "id": "France_Brittany_Ille-et-Vilaine", - "s": 51509896, + "s": 43626409, "affiliations": [ "Bretagne", "France", @@ -3664,7 +3664,7 @@ }, { "id": "France_Brittany_Morbihan", - "s": 42342834, + "s": 35836574, "affiliations": [ "Bretagne", "France" @@ -3680,7 +3680,7 @@ "g": [ { "id": "France_Burgundy_Cote-dOr", - "s": 27080167, + "s": 24155239, "affiliations": [ "Bourgogne-Franche-Comt\u00e9", "France" @@ -3691,7 +3691,7 @@ }, { "id": "France_Burgundy_Nievre", - "s": 15123223, + "s": 13600837, "affiliations": [ "Bourgogne-Franche-Comt\u00e9", "France" @@ -3702,7 +3702,7 @@ }, { "id": "France_Burgundy_Saone-et-Loire", - "s": 45728595, + "s": 40408744, "affiliations": [ "Bourgogne-Franche-Comt\u00e9", "France" @@ -3713,7 +3713,7 @@ }, { "id": "France_Burgundy_Yonne", - "s": 24435556, + "s": 21668664, "affiliations": [ "Bourgogne-Franche-Comt\u00e9", "France" @@ -3729,7 +3729,7 @@ "g": [ { "id": "France_Centre-Val de Loire_Cher", - "s": 17953733, + "s": 16256590, "affiliations": [ "Centre-Val de Loire", "France" @@ -3740,7 +3740,7 @@ }, { "id": "France_Centre-Val de Loire_Eure-et-Loir", - "s": 18563013, + "s": 16151803, "affiliations": [ "Centre-Val de Loire", "France" @@ -3751,7 +3751,7 @@ }, { "id": "France_Centre-Val de Loire_Indre", - "s": 20965939, + "s": 18860705, "affiliations": [ "Centre-Val de Loire", "France" @@ -3762,7 +3762,7 @@ }, { "id": "France_Centre-Val de Loire_Indre-et-Loire", - "s": 30332617, + "s": 27116137, "affiliations": [ "Centre-Val de Loire", "France" @@ -3773,7 +3773,7 @@ }, { "id": "France_Centre-Val de Loire_Loir-et-Cher", - "s": 18456446, + "s": 17064954, "affiliations": [ "Centre-Val de Loire", "France" @@ -3784,7 +3784,7 @@ }, { "id": "France_Centre-Val de Loire_Loiret", - "s": 28144488, + "s": 25276440, "affiliations": [ "Centre-Val de Loire", "France" @@ -3797,7 +3797,7 @@ }, { "id": "France_Champagne-Ardenne", - "s": 54403756, + "s": 47350484, "affiliations": [ "Alsace-Champagne-Ardenne-Lorraine", "France" @@ -3808,7 +3808,7 @@ }, { "id": "France_Corsica", - "s": 11948876, + "s": 10979761, "affiliations": [ "Corse - Mer M\u00e9diterran\u00e9e", "Corse", @@ -3822,7 +3822,7 @@ }, { "id": "France_Free County_North", - "s": 36646737, + "s": 32267077, "affiliations": [ "Bourgogne-Franche-Comt\u00e9", "France" @@ -3833,7 +3833,7 @@ }, { "id": "France_Free County_South", - "s": 26603154, + "s": 23278130, "affiliations": [ "Bourgogne-Franche-Comt\u00e9", "France" @@ -3844,7 +3844,7 @@ }, { "id": "France_French Guiana", - "s": 6976835, + "s": 6378061, "affiliations": [ "France", "Guyane" @@ -3858,7 +3858,7 @@ "g": [ { "id": "France_Ile-de-France_Essonne", - "s": 29211312, + "s": 25505953, "affiliations": [ "France", "\u00cele-de-France" @@ -3869,7 +3869,7 @@ }, { "id": "France_Ile-de-France_Hauts-de-Seine", - "s": 13912407, + "s": 12202701, "affiliations": [ "France", "\u00cele-de-France" @@ -3880,7 +3880,7 @@ }, { "id": "France_Ile-de-France_Paris", - "s": 16237748, + "s": 15202938, "affiliations": [ "France", "\u00cele-de-France" @@ -3891,7 +3891,7 @@ }, { "id": "France_Ile-de-France_Seine-Saint-Denis", - "s": 17045770, + "s": 13877777, "affiliations": [ "France", "\u00cele-de-France" @@ -3902,7 +3902,7 @@ }, { "id": "France_Ile-de-France_Seine-et-Marne", - "s": 38790487, + "s": 33880753, "affiliations": [ "France", "\u00cele-de-France" @@ -3913,7 +3913,7 @@ }, { "id": "France_Ile-de-France_Val-dOise", - "s": 21208911, + "s": 18222245, "affiliations": [ "France", "\u00cele-de-France" @@ -3924,7 +3924,7 @@ }, { "id": "France_Ile-de-France_Val-de-Marne", - "s": 15910494, + "s": 13339173, "affiliations": [ "France", "\u00cele-de-France" @@ -3935,7 +3935,7 @@ }, { "id": "France_Ile-de-France_Yvelines", - "s": 27978872, + "s": 24602568, "affiliations": [ "France", "\u00cele-de-France" @@ -3951,7 +3951,7 @@ "g": [ { "id": "France_Languedoc-Roussillon_Aude", - "s": 27905111, + "s": 24509499, "affiliations": [ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" @@ -3962,7 +3962,7 @@ }, { "id": "France_Languedoc-Roussillon_Gard", - "s": 31434513, + "s": 27369191, "affiliations": [ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" @@ -3973,7 +3973,7 @@ }, { "id": "France_Languedoc-Roussillon_Herault", - "s": 47807392, + "s": 41612326, "affiliations": [ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" @@ -3984,7 +3984,7 @@ }, { "id": "France_Languedoc-Roussillon_Lozere", - "s": 11093269, + "s": 10481927, "affiliations": [ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" @@ -3995,7 +3995,7 @@ }, { "id": "France_Languedoc-Roussillon_Pyrenees-Orientales", - "s": 26045058, + "s": 22329650, "affiliations": [ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" @@ -4008,7 +4008,7 @@ }, { "id": "France_Limousin", - "s": 57761917, + "s": 46362804, "affiliations": [ "Aquitaine-Limousin-Poitou-Charentes", "France" @@ -4022,7 +4022,7 @@ "g": [ { "id": "France_Lorraine_Meurthe-et-Moselle", - "s": 26639446, + "s": 23442674, "affiliations": [ "Alsace-Champagne-Ardenne-Lorraine", "France" @@ -4033,7 +4033,7 @@ }, { "id": "France_Lorraine_Meuse", - "s": 12273280, + "s": 10802334, "affiliations": [ "Alsace-Champagne-Ardenne-Lorraine", "France" @@ -4044,7 +4044,7 @@ }, { "id": "France_Lorraine_Moselle", - "s": 38318898, + "s": 34203737, "affiliations": [ "Alsace-Champagne-Ardenne-Lorraine", "France" @@ -4055,7 +4055,7 @@ }, { "id": "France_Lorraine_Vosges", - "s": 25850136, + "s": 22821384, "affiliations": [ "Alsace-Champagne-Ardenne-Lorraine", "France" @@ -4071,7 +4071,7 @@ "g": [ { "id": "France_Lower Normandy_Calvados", - "s": 30143191, + "s": 25059038, "affiliations": [ "France", "Normandie" @@ -4082,7 +4082,7 @@ }, { "id": "France_Lower Normandy_Manche", - "s": 30640378, + "s": 25298529, "affiliations": [ "France", "Jersey", @@ -4094,7 +4094,7 @@ }, { "id": "France_Lower Normandy_Orne", - "s": 21551619, + "s": 18300553, "affiliations": [ "France", "Normandie" @@ -4110,7 +4110,7 @@ "g": [ { "id": "France_Midi-Pyrenees_Ariege", - "s": 12693526, + "s": 11399139, "affiliations": [ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" @@ -4121,7 +4121,7 @@ }, { "id": "France_Midi-Pyrenees_Aveyron", - "s": 31841917, + "s": 28053409, "affiliations": [ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" @@ -4132,7 +4132,7 @@ }, { "id": "France_Midi-Pyrenees_Gers", - "s": 20443888, + "s": 16929719, "affiliations": [ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" @@ -4143,7 +4143,7 @@ }, { "id": "France_Midi-Pyrenees_Haute-Garonne", - "s": 50548148, + "s": 43443182, "affiliations": [ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" @@ -4154,7 +4154,7 @@ }, { "id": "France_Midi-Pyrenees_Hautes-Pyrenees", - "s": 32997271, + "s": 29756269, "affiliations": [ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" @@ -4165,7 +4165,7 @@ }, { "id": "France_Midi-Pyrenees_Lot", - "s": 16814222, + "s": 14047207, "affiliations": [ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" @@ -4176,7 +4176,7 @@ }, { "id": "France_Midi-Pyrenees_Tarn", - "s": 25004237, + "s": 21087262, "affiliations": [ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" @@ -4187,7 +4187,7 @@ }, { "id": "France_Midi-Pyrenees_Tarn-et-Garonne", - "s": 15986685, + "s": 13297930, "affiliations": [ "France", "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es" @@ -4200,7 +4200,7 @@ }, { "id": "France_New Caledonia", - "s": 6978398, + "s": 6078202, "affiliations": [ "France", "France, Nouvelle-Cal\u00e9donie, Grande Terre et r\u00e9cifs d'Entrecasteaux (eaux territoriales)", @@ -4222,7 +4222,7 @@ "g": [ { "id": "France_Nord-Pas-de-Calais_Nord", - "s": 35696523, + "s": 30958393, "affiliations": [ "France", "Nord-Pas-de-Calais-Picardie" @@ -4233,7 +4233,7 @@ }, { "id": "France_Nord-Pas-de-Calais_Lille", - "s": 41595624, + "s": 35302086, "affiliations": [ "France", "Nord-Pas-de-Calais-Picardie" @@ -4244,7 +4244,7 @@ }, { "id": "France_Nord-Pas-de-Calais_Pas-de-Calais", - "s": 55929816, + "s": 47727710, "affiliations": [ "England", "France", @@ -4262,7 +4262,7 @@ "g": [ { "id": "France_Pays de la Loire_Loire-Atlantique_Nantes", - "s": 43068044, + "s": 37639992, "affiliations": [ "France", "Pays de la Loire" @@ -4273,7 +4273,7 @@ }, { "id": "France_Pays de la Loire_Loire-Atlantique_Saint-Nazaire", - "s": 23815103, + "s": 19991825, "affiliations": [ "France", "Pays de la Loire" @@ -4284,7 +4284,7 @@ }, { "id": "France_Pays de la Loire_Maine-et-Loire", - "s": 41427037, + "s": 35574001, "affiliations": [ "France", "Pays de la Loire" @@ -4295,7 +4295,7 @@ }, { "id": "France_Pays de la Loire_Mayenne", - "s": 22777374, + "s": 19161312, "affiliations": [ "France", "Pays de la Loire" @@ -4306,7 +4306,7 @@ }, { "id": "France_Pays de la Loire_Sarthe", - "s": 36117039, + "s": 31968241, "affiliations": [ "France", "Pays de la Loire" @@ -4317,7 +4317,7 @@ }, { "id": "France_Pays de la Loire_Vendee", - "s": 53743953, + "s": 45711882, "affiliations": [ "France", "Pays de la Loire" @@ -4333,7 +4333,7 @@ "g": [ { "id": "France_Picardy_Aisne", - "s": 27468811, + "s": 25134058, "affiliations": [ "France", "Nord-Pas-de-Calais-Picardie" @@ -4344,7 +4344,7 @@ }, { "id": "France_Picardy_Oise", - "s": 31356915, + "s": 28946704, "affiliations": [ "France", "Nord-Pas-de-Calais-Picardie" @@ -4355,7 +4355,7 @@ }, { "id": "France_Picardy_Somme", - "s": 30511568, + "s": 27428950, "affiliations": [ "France", "Nord-Pas-de-Calais-Picardie" @@ -4371,7 +4371,7 @@ "g": [ { "id": "France_Poitou-Charentes_Charente", - "s": 26096102, + "s": 21770199, "affiliations": [ "Aquitaine-Limousin-Poitou-Charentes", "France" @@ -4382,7 +4382,7 @@ }, { "id": "France_Poitou-Charentes_Charente-Maritime", - "s": 48631956, + "s": 40781615, "affiliations": [ "Aquitaine-Limousin-Poitou-Charentes", "France" @@ -4393,7 +4393,7 @@ }, { "id": "France_Poitou-Charentes_Deux-Sevres", - "s": 33203484, + "s": 29767753, "affiliations": [ "Aquitaine-Limousin-Poitou-Charentes", "France" @@ -4404,7 +4404,7 @@ }, { "id": "France_Poitou-Charentes_Vienne", - "s": 29950770, + "s": 27190605, "affiliations": [ "Aquitaine-Limousin-Poitou-Charentes", "France" @@ -4420,7 +4420,7 @@ "g": [ { "id": "France_Provence-Alpes-Cote dAzur_Alpes-de-Haute-Provence", - "s": 15457637, + "s": 14317642, "affiliations": [ "France", "Provence-Alpes-C\u00f4te d'Azur" @@ -4431,7 +4431,7 @@ }, { "id": "France_Provence-Alpes-Cote dAzur_Bouches-du-Rhone", - "s": 52369698, + "s": 46008941, "affiliations": [ "France", "Provence-Alpes-C\u00f4te d'Azur" @@ -4442,7 +4442,7 @@ }, { "id": "France_Provence-Alpes-Cote dAzur_Hautes-Alpes", - "s": 13136746, + "s": 12022399, "affiliations": [ "France", "Provence-Alpes-C\u00f4te d'Azur" @@ -4453,7 +4453,7 @@ }, { "id": "France_Provence-Alpes-Cote dAzur_Maritime Alps", - "s": 28150234, + "s": 25946711, "affiliations": [ "France", "Provence-Alpes-C\u00f4te d'Azur" @@ -4465,7 +4465,7 @@ }, { "id": "France_Provence-Alpes-Cote dAzur_Var", - "s": 39724437, + "s": 35194159, "affiliations": [ "France", "Provence-Alpes-C\u00f4te d'Azur" @@ -4476,7 +4476,7 @@ }, { "id": "France_Provence-Alpes-Cote dAzur_Vaucluse", - "s": 29357455, + "s": 25283620, "affiliations": [ "France", "Provence-Alpes-C\u00f4te d'Azur" @@ -4492,7 +4492,7 @@ "g": [ { "id": "France_Rhone-Alpes_Ain", - "s": 37166267, + "s": 32809437, "affiliations": [ "Auvergne-Rh\u00f4ne-Alpes", "France" @@ -4503,7 +4503,7 @@ }, { "id": "France_Rhone-Alpes_Ardeche", - "s": 25039480, + "s": 21617922, "affiliations": [ "Auvergne-Rh\u00f4ne-Alpes", "France" @@ -4514,7 +4514,7 @@ }, { "id": "France_Rhone-Alpes_Drome", - "s": 30483598, + "s": 26877183, "affiliations": [ "Auvergne-Rh\u00f4ne-Alpes", "France", @@ -4526,7 +4526,7 @@ }, { "id": "France_Rhone-Alpes_Haute-Savoie", - "s": 32907930, + "s": 28869138, "affiliations": [ "Auvergne-Rh\u00f4ne-Alpes", "France" @@ -4537,7 +4537,7 @@ }, { "id": "France_Rhone-Alpes_Isere", - "s": 47416752, + "s": 40884669, "affiliations": [ "Auvergne-Rh\u00f4ne-Alpes", "France" @@ -4548,7 +4548,7 @@ }, { "id": "France_Rhone-Alpes_Loire", - "s": 29231527, + "s": 25536043, "affiliations": [ "Auvergne-Rh\u00f4ne-Alpes", "France" @@ -4559,7 +4559,7 @@ }, { "id": "France_Rhone-Alpes_Rhone", - "s": 44152944, + "s": 38142978, "affiliations": [ "Auvergne-Rh\u00f4ne-Alpes", "France" @@ -4570,7 +4570,7 @@ }, { "id": "France_Rhone-Alpes_Savoie", - "s": 23445717, + "s": 21042551, "affiliations": [ "Auvergne-Rh\u00f4ne-Alpes", "France" @@ -4583,7 +4583,7 @@ }, { "id": "France_Southern Islands", - "s": 25245085, + "s": 22645485, "affiliations": [ "France", "France, Mayotte (eaux territoriales)", @@ -4605,7 +4605,7 @@ }, { "id": "France_Upper Normandy", - "s": 58973044, + "s": 47800109, "affiliations": [ "France", "Normandie" @@ -4616,7 +4616,7 @@ }, { "id": "French Polynesia", - "s": 2899455, + "s": 2543276, "affiliations": [ "France", "France, Polyn\u00e9sie fran\u00e7aise, \u00celes Gambier (eaux territoriales)", @@ -4634,7 +4634,7 @@ }, { "id": "Wallis and Futuna", - "s": 360563, + "s": 330574, "affiliations": [ "France", "France, Wallis-et-Futuna (eaux territoriales)" @@ -4647,7 +4647,7 @@ }, { "id": "Gabon", - "s": 5675796, + "s": 5197960, "affiliations": [ "Estuaire", "Gabon", @@ -4669,7 +4669,7 @@ "g": [ { "id": "Georgia", - "s": 42227476, + "s": 27774234, "affiliations": [ "\u10d7\u10d1\u10d8\u10da\u10d8\u10e1\u10d8", "\u10d8\u10db\u10d4\u10e0\u10d4\u10d7\u10d8", @@ -4690,7 +4690,7 @@ }, { "id": "Abkhazia", - "s": 5268168, + "s": 4433955, "affiliations": [ "\u0410\u0431\u0445\u0430\u0437\u0438\u044f - \u0410\u04a7\u0441\u043d\u044b", "\u10d0\u10e4\u10ee\u10d0\u10d6\u10d4\u10d7\u10d8\u10e1 \u10d0\u10d5\u10e2\u10dd\u10dc\u10dd\u10db\u10d8\u10e3\u10e0\u10d8 \u10e0\u10d4\u10e1\u10de\u10e3\u10d1\u10da\u10d8\u10d9\u10d0 - \u0410\u04a7\u0441\u043d\u044b \u0410\u0432\u0442\u043e\u043d\u043e\u043c\u0442\u04d9 \u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430", @@ -4702,7 +4702,7 @@ }, { "id": "South Ossetia", - "s": 1691945, + "s": 1326394, "affiliations": [ "\u0425\u0443\u0441\u0441\u0430\u0440 \u0418\u0440\u044b\u0441\u0442\u043e\u043d", "\u0425\u0443\u0441\u0441\u0430\u0440 \u0418\u0440\u044b\u0441\u0442\u043e\u043d - \u042e\u0436\u043d\u0430\u044f \u041e\u0441\u0435\u0442\u0438\u044f", @@ -4722,7 +4722,7 @@ "g": [ { "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Freiburg", - "s": 94183881, + "s": 81998576, "affiliations": [ "Baden-W\u00fcrttemberg", "Deutschland", @@ -4735,7 +4735,7 @@ }, { "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Karlsruhe", - "s": 94001434, + "s": 85295957, "affiliations": [ "Baden-W\u00fcrttemberg", "Deutschland" @@ -4746,7 +4746,7 @@ }, { "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Stuttgart_Heilbronn", - "s": 31483809, + "s": 30487668, "affiliations": [ "Baden-W\u00fcrttemberg", "Deutschland" @@ -4757,7 +4757,7 @@ }, { "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Stuttgart_Stuttgart", - "s": 90404498, + "s": 80666451, "affiliations": [ "Baden-W\u00fcrttemberg", "Deutschland" @@ -4768,7 +4768,7 @@ }, { "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Tubingen", - "s": 67907955, + "s": 58866936, "affiliations": [ "Baden-W\u00fcrttemberg", "Deutschland" @@ -4781,7 +4781,7 @@ }, { "id": "Germany_Berlin", - "s": 49962774, + "s": 44517534, "affiliations": [ "Berlin", "Deutschland" @@ -4792,7 +4792,7 @@ }, { "id": "Germany_Brandenburg_North", - "s": 47763286, + "s": 42449160, "affiliations": [ "Brandenburg", "Deutschland" @@ -4803,7 +4803,7 @@ }, { "id": "Germany_Brandenburg_South", - "s": 50370479, + "s": 43127488, "affiliations": [ "Brandenburg", "Deutschland" @@ -4817,7 +4817,7 @@ "g": [ { "id": "Germany_Free State of Bavaria_Lower Bavaria", - "s": 52951516, + "s": 43266450, "affiliations": [ "Bayern", "Deutschland" @@ -4828,7 +4828,7 @@ }, { "id": "Germany_Free State of Bavaria_Lower Franconia", - "s": 49345580, + "s": 44485343, "affiliations": [ "Bayern", "Deutschland" @@ -4839,7 +4839,7 @@ }, { "id": "Germany_Free State of Bavaria_Middle Franconia", - "s": 54954070, + "s": 48566727, "affiliations": [ "Bayern", "Deutschland" @@ -4850,7 +4850,7 @@ }, { "id": "Germany_Free State of Bavaria_Swabia", - "s": 75183799, + "s": 65565095, "affiliations": [ "Bayern", "Deutschland" @@ -4861,7 +4861,7 @@ }, { "id": "Germany_Free State of Bavaria_Upper Bavaria_East", - "s": 49583512, + "s": 41009483, "affiliations": [ "Bayern", "Deutschland" @@ -4872,7 +4872,7 @@ }, { "id": "Germany_Free State of Bavaria_Upper Bavaria_Ingolstadt", - "s": 25378541, + "s": 22365690, "affiliations": [ "Bayern", "Deutschland" @@ -4883,7 +4883,7 @@ }, { "id": "Germany_Free State of Bavaria_Upper Bavaria_Munchen", - "s": 47132758, + "s": 40880382, "affiliations": [ "Bayern", "Deutschland" @@ -4894,7 +4894,7 @@ }, { "id": "Germany_Free State of Bavaria_Upper Bavaria_South", - "s": 21739813, + "s": 18415924, "affiliations": [ "Bayern", "Deutschland" @@ -4905,7 +4905,7 @@ }, { "id": "Germany_Free State of Bavaria_Upper Franconia", - "s": 49479327, + "s": 43350894, "affiliations": [ "Bayern", "Deutschland" @@ -4916,7 +4916,7 @@ }, { "id": "Germany_Free State of Bavaria_Upper Palatinate", - "s": 49075677, + "s": 41631985, "affiliations": [ "Bayern", "Deutschland" @@ -4929,7 +4929,7 @@ }, { "id": "Germany_Hamburg_main", - "s": 27404559, + "s": 24127014, "affiliations": [ "Deutschland", "Hamburg" @@ -4943,7 +4943,7 @@ "g": [ { "id": "Germany_Hesse_Regierungsbezirk Darmstadt", - "s": 94234596, + "s": 84230172, "affiliations": [ "Deutschland", "Hessen" @@ -4954,7 +4954,7 @@ }, { "id": "Germany_Hesse_Regierungsbezirk Giessen", - "s": 38353440, + "s": 34930449, "affiliations": [ "Deutschland", "Hessen" @@ -4965,7 +4965,7 @@ }, { "id": "Germany_Hesse_Regierungsbezirk Kassel", - "s": 53691091, + "s": 49740086, "affiliations": [ "Deutschland", "Hessen" @@ -4981,7 +4981,7 @@ "g": [ { "id": "Germany_Lower Saxony_Bremen_Bremen", - "s": 51091622, + "s": 43843108, "affiliations": [ "Bremen", "Deutschland", @@ -4995,7 +4995,7 @@ }, { "id": "Germany_Lower Saxony_Bremen_Munster", - "s": 53269337, + "s": 46298680, "affiliations": [ "Deutschland", "Niedersachsen" @@ -5006,7 +5006,7 @@ }, { "id": "Germany_Lower Saxony_Hannover", - "s": 47056333, + "s": 40650724, "affiliations": [ "Deutschland", "Niedersachsen" @@ -5017,7 +5017,7 @@ }, { "id": "Germany_Lower Saxony_Braunschweig", - "s": 55212157, + "s": 49201352, "affiliations": [ "Deutschland", "Niedersachsen" @@ -5028,7 +5028,7 @@ }, { "id": "Germany_Lower Saxony_Oldenburg", - "s": 80289463, + "s": 64618355, "affiliations": [ "Bremen", "Deutschland", @@ -5042,7 +5042,7 @@ }, { "id": "Germany_Mecklenburg-Vorpommern", - "s": 75328056, + "s": 65160662, "affiliations": [ "Deutschland", "Mecklenburg-Vorpommern" @@ -5056,7 +5056,7 @@ "g": [ { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Arnsberg_Arnsberg", - "s": 47408527, + "s": 44236768, "affiliations": [ "Deutschland", "Nordrhein-Westfalen" @@ -5067,7 +5067,7 @@ }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Arnsberg_Dortmund", - "s": 77319776, + "s": 67294040, "affiliations": [ "Deutschland", "Nordrhein-Westfalen" @@ -5078,7 +5078,7 @@ }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Detmold", - "s": 86636595, + "s": 74102411, "affiliations": [ "Deutschland", "Nordrhein-Westfalen" @@ -5089,7 +5089,7 @@ }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Dusseldorf", - "s": 66610742, + "s": 59141701, "affiliations": [ "Deutschland", "Nordrhein-Westfalen" @@ -5100,7 +5100,7 @@ }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Mulheim", - "s": 58913658, + "s": 51488898, "affiliations": [ "Deutschland", "Nordrhein-Westfalen" @@ -5111,7 +5111,7 @@ }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Wesel", - "s": 19080558, + "s": 16725787, "affiliations": [ "Deutschland", "Nordrhein-Westfalen" @@ -5122,7 +5122,7 @@ }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Aachen", - "s": 64327822, + "s": 58791738, "affiliations": [ "Deutschland", "Deutschland - Belgique / Belgi\u00eb / Belgien", @@ -5134,7 +5134,7 @@ }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Koln", - "s": 81875282, + "s": 73289119, "affiliations": [ "Deutschland", "Nordrhein-Westfalen" @@ -5145,7 +5145,7 @@ }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Munster_Munster", - "s": 45170969, + "s": 38593093, "affiliations": [ "Deutschland", "Nordrhein-Westfalen" @@ -5156,7 +5156,7 @@ }, { "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Munster_Recklinghausen", - "s": 53464596, + "s": 45943638, "affiliations": [ "Deutschland", "Nordrhein-Westfalen" @@ -5169,7 +5169,7 @@ }, { "id": "Germany_Rhineland-Palatinate_Koblenz", - "s": 64952093, + "s": 58075240, "affiliations": [ "Deutschland", "Rheinland-Pfalz" @@ -5180,7 +5180,7 @@ }, { "id": "Germany_Rhineland-Palatinate_South", - "s": 64280912, + "s": 54946140, "affiliations": [ "Deutschland", "Rheinland-Pfalz" @@ -5191,7 +5191,7 @@ }, { "id": "Germany_Saarland", - "s": 29140677, + "s": 25411526, "affiliations": [ "Deutschland", "Saarland" @@ -5202,7 +5202,7 @@ }, { "id": "Germany_Saxony-Anhalt_Magdeburg", - "s": 42291182, + "s": 36644733, "affiliations": [ "Deutschland", "Sachsen-Anhalt" @@ -5213,7 +5213,7 @@ }, { "id": "Germany_Saxony-Anhalt_Halle", - "s": 38731213, + "s": 34134730, "affiliations": [ "Deutschland", "Sachsen-Anhalt" @@ -5224,7 +5224,7 @@ }, { "id": "Germany_Saxony_Dresden", - "s": 54446691, + "s": 46532362, "affiliations": [ "Deutschland", "Sachsen" @@ -5235,7 +5235,7 @@ }, { "id": "Germany_Saxony_Leipzig", - "s": 92285639, + "s": 77060632, "affiliations": [ "Deutschland", "Sachsen" @@ -5246,7 +5246,7 @@ }, { "id": "Germany_Schleswig-Holstein_Kiel", - "s": 49127386, + "s": 41573849, "affiliations": [ "Danmark", "Deutschland", @@ -5258,7 +5258,7 @@ }, { "id": "Germany_Schleswig-Holstein_Flensburg", - "s": 47928902, + "s": 40538654, "affiliations": [ "Deutschland", "Schleswig-Holstein" @@ -5269,7 +5269,7 @@ }, { "id": "Germany_Thuringia", - "s": 83652197, + "s": 72918913, "affiliations": [ "Deutschland", "Th\u00fcringen" @@ -5282,7 +5282,7 @@ }, { "id": "Ghana", - "s": 20923334, + "s": 10764124, "affiliations": [ "Ashanti Region", "Brong-Ahafo Region", @@ -5302,7 +5302,7 @@ }, { "id": "Gibraltar", - "s": 336065, + "s": 287072, "affiliations": [ "Espa\u00f1a", "Gibraltar" @@ -5317,7 +5317,7 @@ "g": [ { "id": "Greece_Decentralized Administration of Crete", - "s": 11087707, + "s": 8495042, "affiliations": [ "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1", "Territorial waters of Greece - Gavdos and Gavdopoula", @@ -5329,7 +5329,7 @@ }, { "id": "Greece_Decentralized Administration of West Greece", - "s": 29468244, + "s": 20563176, "affiliations": [ "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1", "Territorial waters of Greece - Strofades", @@ -5342,7 +5342,7 @@ }, { "id": "Greece_Decentralized Administration of Aegean", - "s": 19016796, + "s": 15985246, "affiliations": [ "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1", "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u0391\u03b9\u03b3\u03b1\u03af\u03bf\u03c5" @@ -5353,7 +5353,7 @@ }, { "id": "Greece_Decentralized Administration of Epirus - Western Macedonia", - "s": 15966235, + "s": 11939323, "affiliations": [ "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1", "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u0397\u03c0\u03b5\u03af\u03c1\u03bf\u03c5 - \u0394\u03c5\u03c4\u03b9\u03ba\u03ae\u03c2 \u039c\u03b1\u03ba\u03b5\u03b4\u03bf\u03bd\u03af\u03b1\u03c2" @@ -5364,7 +5364,7 @@ }, { "id": "Greece_Decentralized Administration of Macedonia and Thrace", - "s": 36142140, + "s": 21344088, "affiliations": [ "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1", "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u039c\u03b1\u03ba\u03b5\u03b4\u03bf\u03bd\u03af\u03b1\u03c2 - \u0398\u03c1\u03ac\u03ba\u03b7\u03c2" @@ -5375,7 +5375,7 @@ }, { "id": "Greece_Decentralized Administration of Thessaly - Central Greece", - "s": 35757872, + "s": 24593938, "affiliations": [ "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1", "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u0391\u03c4\u03c4\u03b9\u03ba\u03ae\u03c2", @@ -5387,7 +5387,7 @@ }, { "id": "Greece_Decentralized Administration of Attica", - "s": 32988006, + "s": 18982005, "affiliations": [ "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1", "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u0391\u03c4\u03c4\u03b9\u03ba\u03ae\u03c2" @@ -5400,7 +5400,7 @@ }, { "id": "Greenland", - "s": 23718724, + "s": 23550317, "affiliations": [ "Kalaallit Nunaat" ], @@ -5410,7 +5410,7 @@ }, { "id": "Guatemala", - "s": 38042727, + "s": 24569917, "affiliations": [ "Alta Verapaz", "Baja Verapaz", @@ -5442,7 +5442,7 @@ }, { "id": "Guernsey", - "s": 986492, + "s": 734576, "affiliations": [ "Alderney", "Brecqhou", @@ -5475,7 +5475,7 @@ }, { "id": "Guinea", - "s": 39855526, + "s": 32809111, "affiliations": [ "Conakry", "Faranah", @@ -5493,7 +5493,7 @@ }, { "id": "Guinea-Bissau", - "s": 4299400, + "s": 3905131, "affiliations": [ "Guin\u00e9-Bissau", "Regi\u00e3o de Bafat\u00e1", @@ -5511,7 +5511,7 @@ }, { "id": "Guyana", - "s": 4870177, + "s": 3410081, "affiliations": [ "Guyana" ], @@ -5521,7 +5521,7 @@ }, { "id": "Haiti", - "s": 38045948, + "s": 32088993, "affiliations": [ "Ayiti", "D\u00e9partement de l'Artibonite", @@ -5541,7 +5541,7 @@ }, { "id": "Honduras", - "s": 26643953, + "s": 14692989, "affiliations": [ "Atl\u00e1ntida", "Chinandega", @@ -5573,7 +5573,7 @@ "g": [ { "id": "Hungary_Northern Great Plain", - "s": 53024969, + "s": 41464369, "affiliations": [ "Alf\u00f6ld \u00e9s \u00c9szak", "Magyarorsz\u00e1g" @@ -5584,7 +5584,7 @@ }, { "id": "Hungary_Transdanubia", - "s": 61082711, + "s": 51629729, "affiliations": [ "Dun\u00e1nt\u00fal", "Magyarorsz\u00e1g" @@ -5595,7 +5595,7 @@ }, { "id": "Hungary_Kozep-Magyarorszag", - "s": 35645899, + "s": 27421995, "affiliations": [ "K\u00f6z\u00e9p-Magyarorsz\u00e1g", "Magyarorsz\u00e1g" @@ -5608,7 +5608,7 @@ }, { "id": "Iceland", - "s": 21529629, + "s": 19135141, "affiliations": [ "\u00cdsland" ], @@ -5621,7 +5621,7 @@ "g": [ { "id": "India_Andaman and Nicobar Islands", - "s": 1560902, + "s": 1300625, "affiliations": [ "Andaman and Nicobar Islands", "India" @@ -5632,7 +5632,7 @@ }, { "id": "India_Lakshadweep", - "s": 284375, + "s": 280947, "affiliations": [ "India", "Lakshadweep" @@ -5643,7 +5643,7 @@ }, { "id": "India_Andhra Pradesh", - "s": 30670426, + "s": 17658902, "affiliations": [ "Andhra Pradesh", "India", @@ -5655,7 +5655,7 @@ }, { "id": "India_Gujarat", - "s": 28739317, + "s": 15401062, "affiliations": [ "Gujarat", "India", @@ -5668,7 +5668,7 @@ }, { "id": "India_Kerala", - "s": 16838504, + "s": 11450040, "affiliations": [ "India", "Kerala" @@ -5679,7 +5679,7 @@ }, { "id": "India_Madhya Pradesh", - "s": 27198498, + "s": 17685200, "affiliations": [ "India", "Madhya Pradesh" @@ -5690,7 +5690,7 @@ }, { "id": "India_Rajasthan", - "s": 41902451, + "s": 19227143, "affiliations": [ "India", "Rajasthan" @@ -5701,7 +5701,7 @@ }, { "id": "India_Tamil Nadu", - "s": 56938055, + "s": 28681139, "affiliations": [ "Cuddalore-Puducherry Administrative Boundary", "India", @@ -5718,7 +5718,7 @@ }, { "id": "India_Haryana", - "s": 40995954, + "s": 16482656, "affiliations": [ "Haryana", "India" @@ -5729,7 +5729,7 @@ }, { "id": "India_Goa", - "s": 3442964, + "s": 2249516, "affiliations": [ "Goa", "India" @@ -5740,7 +5740,7 @@ }, { "id": "India_Karnataka_North", - "s": 25469714, + "s": 16296670, "affiliations": [ "India", "Karnataka" @@ -5751,7 +5751,7 @@ }, { "id": "India_Karnataka_South", - "s": 54736738, + "s": 30645364, "affiliations": [ "India", "Karnataka" @@ -5762,7 +5762,7 @@ }, { "id": "India_Maharashtra", - "s": 78020367, + "s": 45442996, "affiliations": [ "Ankisha", "Ganjiramannapeta", @@ -5778,7 +5778,7 @@ }, { "id": "India_Telangana", - "s": 74987680, + "s": 32860195, "affiliations": [ "India", "Telangana" @@ -5789,7 +5789,7 @@ }, { "id": "India_Delhi", - "s": 24414238, + "s": 9740210, "affiliations": [ "Delhi", "India" @@ -5800,7 +5800,7 @@ }, { "id": "India_Uttar Pradesh", - "s": 43981045, + "s": 20052422, "affiliations": [ "Uttar Pradesh", "India" @@ -5811,7 +5811,7 @@ }, { "id": "India_Odisha", - "s": 11536952, + "s": 7281179, "affiliations": [ "India", "Odisha" @@ -5822,7 +5822,7 @@ }, { "id": "India_Chhattisgarh", - "s": 7468073, + "s": 5721345, "affiliations": [ "Chhattisgarh", "India" @@ -5833,7 +5833,7 @@ }, { "id": "India_Jharkhand", - "s": 4975812, + "s": 3943955, "affiliations": [ "Jharkhand", "India" @@ -5844,7 +5844,7 @@ }, { "id": "India_Bihar", - "s": 9021400, + "s": 6222561, "affiliations": [ "Bihar", "India" @@ -5855,7 +5855,7 @@ }, { "id": "India_Tripura", - "s": 668381, + "s": 563969, "affiliations": [ "India", "Tripura" @@ -5866,7 +5866,7 @@ }, { "id": "India_West Bengal", - "s": 33585964, + "s": 23220057, "affiliations": [ "Border India - Bangladesh", "Dist. Judges Court", @@ -5879,7 +5879,7 @@ }, { "id": "India_Sikkim", - "s": 923948, + "s": 885184, "affiliations": [ "India", "Sikkim" @@ -5890,7 +5890,7 @@ }, { "id": "India_Uttarakhand", - "s": 7747066, + "s": 6476289, "affiliations": [ "Uttarakhand", "India" @@ -5901,7 +5901,7 @@ }, { "id": "India_Mizoram", - "s": 704730, + "s": 681544, "affiliations": [ "India", "Mizoram" @@ -5912,7 +5912,7 @@ }, { "id": "India_Meghalaya", - "s": 1010857, + "s": 893493, "affiliations": [ "India", "Meghalaya" @@ -5923,7 +5923,7 @@ }, { "id": "India_Manipur", - "s": 814327, + "s": 695079, "affiliations": [ "India", "Manipur" @@ -5934,7 +5934,7 @@ }, { "id": "India_Nagaland", - "s": 615069, + "s": 577263, "affiliations": [ "India", "Nagaland" @@ -5945,7 +5945,7 @@ }, { "id": "India_Assam", - "s": 3742668, + "s": 3025999, "affiliations": [ "Assam", "India" @@ -5956,7 +5956,7 @@ }, { "id": "India_Arunachal Pradesh", - "s": 2144152, + "s": 2036644, "affiliations": [ "Arunachal Pradesh", "India" @@ -5967,7 +5967,7 @@ }, { "id": "India_Himachal Pradesh", - "s": 4185057, + "s": 4032348, "affiliations": [ "Himachal Pradesh", "India" @@ -5978,7 +5978,7 @@ }, { "id": "India_Jammu and Kashmir", - "s": 6965278, + "s": 5313718, "affiliations": [ "India", "Jammu and Kashmir" @@ -5989,7 +5989,7 @@ }, { "id": "India_Chandigarh", - "s": 1257313, + "s": 568604, "affiliations": [ "India", "Union Territory of Chand\u012bgarh" @@ -6000,7 +6000,7 @@ }, { "id": "India_Punjab", - "s": 19348750, + "s": 6666882, "affiliations": [ "India", "Punjab" @@ -6016,7 +6016,7 @@ "g": [ { "id": "Indonesia_Central", - "s": 68885885, + "s": 53402287, "affiliations": [ "Gorontalo", "Indonesia", @@ -6037,7 +6037,7 @@ }, { "id": "Indonesia_West", - "s": 48899453, + "s": 33843754, "affiliations": [ "Aceh", "Banten", @@ -6059,7 +6059,7 @@ }, { "id": "Indonesia_Jawa Tengah", - "s": 37780280, + "s": 27911837, "affiliations": [ "Daerah Istimewa Yogyakarta", "Indonesia", @@ -6071,7 +6071,7 @@ }, { "id": "Indonesia_Jawa Barat", - "s": 57204149, + "s": 41789260, "affiliations": [ "Banten", "Daerah Khusus Ibukota Jakarta", @@ -6084,7 +6084,7 @@ }, { "id": "Indonesia_Nusa Tenggara", - "s": 43736434, + "s": 36012431, "affiliations": [ "Bali", "Batas Dusun Muntigunung Induk", @@ -6099,7 +6099,7 @@ }, { "id": "Indonesia_Jawa Timur", - "s": 59250871, + "s": 45563783, "affiliations": [ "Indonesia", "Jawa Timur" @@ -6110,7 +6110,7 @@ }, { "id": "Indonesia_East", - "s": 14208811, + "s": 12100777, "affiliations": [ "Indonesia", "Maluku", @@ -6129,7 +6129,7 @@ "g": [ { "id": "Iran_East", - "s": 33012945, + "s": 14260993, "affiliations": [ "\u06cc\u0632\u062f\u200e", "\u06a9\u0631\u0645\u0627\u0646", @@ -6145,7 +6145,7 @@ }, { "id": "Iran_South", - "s": 66375734, + "s": 30903819, "affiliations": [ "\u0644\u0631\u0633\u062a\u0627\u0646\u200e", "\u0641\u0627\u0631\u0633\u200e", @@ -6168,7 +6168,7 @@ }, { "id": "Iran_North", - "s": 65217791, + "s": 32743154, "affiliations": [ "\u0642\u0645\u200e", "\u0627\u0644\u0628\u0631\u0632", @@ -6197,7 +6197,7 @@ "g": [ { "id": "Iraq_North", - "s": 40273731, + "s": 20938982, "affiliations": [ "\u062c\u0645\u0647\u0648\u0631\u064a\u0629 \u0627\u0644\u0639\u0631\u0627\u0642", "garaki handren", @@ -6217,7 +6217,7 @@ }, { "id": "Iraq_South", - "s": 36578686, + "s": 18481847, "affiliations": [ "\u062c\u0645\u0647\u0648\u0631\u064a\u0629 \u0627\u0644\u0639\u0631\u0627\u0642", "\u0630\u064a \u0642\u0627\u0631", @@ -6242,7 +6242,7 @@ }, { "id": "Isle of Man", - "s": 2321666, + "s": 1823028, "affiliations": [ "Isle of Man", "Scotland", @@ -6257,7 +6257,7 @@ "g": [ { "id": "Jerusalem", - "s": 4390238, + "s": 3671013, "affiliations": [ "\u05de\u05d7\u05d5\u05d6 \u05d9\u05e8\u05d5\u05e9\u05dc\u05d9\u05dd", "\u05de\u05d3\u05d9\u05e0\u05ea \u05d9\u05e9\u05e8\u05d0\u05dc" @@ -6269,7 +6269,7 @@ }, { "id": "Israel", - "s": 44950703, + "s": 35357555, "affiliations": [ "\u05de\u05d7\u05d5\u05d6 \u05d7\u05d9\u05e4\u05d4", "\u05de\u05d7\u05d5\u05d6 \u05ea\u05dc \u05d0\u05d1\u05d9\u05d1", @@ -6291,7 +6291,7 @@ "g": [ { "id": "Italy_Abruzzo", - "s": 17650491, + "s": 12322941, "affiliations": [ "Abruzzo", "Italia" @@ -6302,7 +6302,7 @@ }, { "id": "Italy_Aosta Valley", - "s": 9575303, + "s": 8799279, "affiliations": [ "Italia", "Valle d'Aosta/Vall\u00e9e d'Aoste" @@ -6313,7 +6313,7 @@ }, { "id": "Italy_Apulia", - "s": 94708725, + "s": 74213301, "affiliations": [ "Isola della Chianca", "Isola della Malva", @@ -6329,7 +6329,7 @@ }, { "id": "Italy_Basilicata", - "s": 10999690, + "s": 9019921, "affiliations": [ "Basilicata", "Italia" @@ -6340,7 +6340,7 @@ }, { "id": "Italy_Calabria", - "s": 27966136, + "s": 20031810, "affiliations": [ "Calabria", "Isola di Cirella", @@ -6353,7 +6353,7 @@ }, { "id": "Italy_Campania", - "s": 35437931, + "s": 24314366, "affiliations": [ "Campania", "Isola Licosa", @@ -6373,7 +6373,7 @@ "g": [ { "id": "Italy_Emilia-Romagna_Bologna", - "s": 23354706, + "s": 24511921, "affiliations": [ "Emilia-Romagna", "Italia" @@ -6384,7 +6384,7 @@ }, { "id": "Italy_Emilia-Romagna_Ferrara", - "s": 12497090, + "s": 11595673, "affiliations": [ "Emilia-Romagna", "Italia" @@ -6395,7 +6395,7 @@ }, { "id": "Italy_Emilia-Romagna_Forli-Cesena", - "s": 10724526, + "s": 11192960, "affiliations": [ "Emilia-Romagna", "Italia" @@ -6406,7 +6406,7 @@ }, { "id": "Italy_Emilia-Romagna_Modena", - "s": 23229518, + "s": 22682605, "affiliations": [ "Emilia-Romagna", "Italia" @@ -6417,7 +6417,7 @@ }, { "id": "Italy_Emilia-Romagna_Parma", - "s": 16672863, + "s": 15403167, "affiliations": [ "Emilia-Romagna", "Italia" @@ -6428,7 +6428,7 @@ }, { "id": "Italy_Emilia-Romagna_Piacenza", - "s": 10818277, + "s": 9809509, "affiliations": [ "Emilia-Romagna", "Italia" @@ -6439,7 +6439,7 @@ }, { "id": "Italy_Emilia-Romagna_Ravenna", - "s": 12107910, + "s": 10533130, "affiliations": [ "Emilia-Romagna", "Italia" @@ -6450,7 +6450,7 @@ }, { "id": "Italy_Emilia-Romagna_Reggio Emilia", - "s": 15219982, + "s": 13407753, "affiliations": [ "Emilia-Romagna", "Italia" @@ -6461,7 +6461,7 @@ }, { "id": "Italy_Emilia-Romagna_Rimini", - "s": 9431174, + "s": 8131717, "affiliations": [ "Emilia-Romagna", "Italia" @@ -6477,7 +6477,7 @@ "g": [ { "id": "Italy_Friuli-Venezia Giulia_Gorizia", - "s": 7255794, + "s": 6687435, "affiliations": [ "Friuli Venezia Giulia", "Italia" @@ -6488,7 +6488,7 @@ }, { "id": "Italy_Friuli-Venezia Giulia_Pordenone", - "s": 18526546, + "s": 17054606, "affiliations": [ "Friuli Venezia Giulia", "Italia" @@ -6499,7 +6499,7 @@ }, { "id": "Italy_Friuli-Venezia Giulia_Trieste", - "s": 6747815, + "s": 6172789, "affiliations": [ "Friuli Venezia Giulia", "Italia" @@ -6510,7 +6510,7 @@ }, { "id": "Italy_Friuli-Venezia Giulia_Udine", - "s": 40508647, + "s": 37280372, "affiliations": [ "Friuli Venezia Giulia", "Italia" @@ -6523,7 +6523,7 @@ }, { "id": "Italy_Lazio", - "s": 55870654, + "s": 43105697, "affiliations": [ "Civitatis Vatican\u00e6", "Gavi", @@ -6540,7 +6540,7 @@ }, { "id": "Italy_Liguria", - "s": 42349123, + "s": 39520796, "affiliations": [ "Italia", "Liguria" @@ -6554,7 +6554,7 @@ "g": [ { "id": "Italy_Lombardy_Bergamo", - "s": 16103879, + "s": 12709104, "affiliations": [ "Italia", "Lombardia" @@ -6565,7 +6565,7 @@ }, { "id": "Italy_Lombardy_Brescia", - "s": 24293988, + "s": 19193683, "affiliations": [ "Italia", "Lombardia" @@ -6576,7 +6576,7 @@ }, { "id": "Italy_Lombardy_Como", - "s": 11087104, + "s": 9367897, "affiliations": [ "Italia", "Lombardia" @@ -6587,7 +6587,7 @@ }, { "id": "Italy_Lombardy_Cremona", - "s": 5387337, + "s": 4072878, "affiliations": [ "Italia", "Lombardia" @@ -6598,7 +6598,7 @@ }, { "id": "Italy_Lombardy_Lecco", - "s": 7886842, + "s": 7048693, "affiliations": [ "Italia", "Lombardia" @@ -6609,7 +6609,7 @@ }, { "id": "Italy_Lombardy_Lodi", - "s": 3877454, + "s": 3154764, "affiliations": [ "Italia", "Lombardia" @@ -6620,7 +6620,7 @@ }, { "id": "Italy_Lombardy_Mantua", - "s": 6803959, + "s": 5001598, "affiliations": [ "Italia", "Lombardia" @@ -6631,7 +6631,7 @@ }, { "id": "Italy_Lombardy_Milan", - "s": 27760343, + "s": 21856886, "affiliations": [ "Italia", "Lombardia" @@ -6642,7 +6642,7 @@ }, { "id": "Italy_Lombardy_Monza and Brianza", - "s": 9562312, + "s": 7219984, "affiliations": [ "Italia", "Lombardia" @@ -6653,7 +6653,7 @@ }, { "id": "Italy_Lombardy_Pavia", - "s": 22456716, + "s": 20564107, "affiliations": [ "Italia", "Lombardia" @@ -6664,7 +6664,7 @@ }, { "id": "Italy_Lombardy_Sondrio", - "s": 7942607, + "s": 7317865, "affiliations": [ "Italia", "Lombardia" @@ -6675,7 +6675,7 @@ }, { "id": "Italy_Lombardy_Varese", - "s": 14646094, + "s": 11357960, "affiliations": [ "Italia", "Lombardia" @@ -6688,7 +6688,7 @@ }, { "id": "Italy_Marche", - "s": 25053457, + "s": 19113359, "affiliations": [ "Italia", "Marche" @@ -6699,7 +6699,7 @@ }, { "id": "Italy_Molise", - "s": 8405750, + "s": 6325725, "affiliations": [ "Italia", "Molise" @@ -6713,7 +6713,7 @@ "g": [ { "id": "Italy_Piemont_Alessandria", - "s": 11743568, + "s": 10247753, "affiliations": [ "Italia", "Piemonte" @@ -6724,7 +6724,7 @@ }, { "id": "Italy_Piemont_Asti", - "s": 4379979, + "s": 3722349, "affiliations": [ "Italia", "Piemonte" @@ -6735,7 +6735,7 @@ }, { "id": "Italy_Piemont_Biella", - "s": 3625133, + "s": 3315366, "affiliations": [ "Italia", "Piemonte" @@ -6746,7 +6746,7 @@ }, { "id": "Italy_Piemont_Cuneo", - "s": 25782901, + "s": 23173722, "affiliations": [ "Italia", "Piemonte" @@ -6757,7 +6757,7 @@ }, { "id": "Italy_Piemont_Novara", - "s": 8149356, + "s": 6682335, "affiliations": [ "Italia", "Piemonte" @@ -6768,7 +6768,7 @@ }, { "id": "Italy_Piemont_Torino", - "s": 30985201, + "s": 25693562, "affiliations": [ "Italia", "Piemonte" @@ -6779,7 +6779,7 @@ }, { "id": "Italy_Piemont_Verbano-Cusio-Ossola", - "s": 6290188, + "s": 5659213, "affiliations": [ "Italia", "Piemonte" @@ -6790,7 +6790,7 @@ }, { "id": "Italy_Piemont_Vercelli", - "s": 6743972, + "s": 6234967, "affiliations": [ "Italia", "Piemonte" @@ -6803,7 +6803,7 @@ }, { "id": "Italy_Sardinia", - "s": 70314831, + "s": 59955899, "affiliations": [ "Isola Tuaredda", "Isola de Sa tonnara", @@ -6824,7 +6824,7 @@ }, { "id": "Italy_Sicily", - "s": 74344340, + "s": 51257129, "affiliations": [ "Isola dei Cani", "Isola delle Correnti", @@ -6872,7 +6872,7 @@ }, { "id": "Italy_Trentino-Alto Adige Sudtirol", - "s": 60308839, + "s": 54900477, "affiliations": [ "Italia", "Trentino-Alto Adige/S\u00fcdtirol" @@ -6883,7 +6883,7 @@ }, { "id": "Italy_Tuscany_Grosseto", - "s": 23256215, + "s": 20195121, "affiliations": [ "Formica Piccola", "Formica Grande", @@ -6900,7 +6900,7 @@ }, { "id": "Italy_Tuscany_Massa e Carrara", - "s": 54499725, + "s": 45738564, "affiliations": [ "Cerboli", "Isola della Peraiola", @@ -6918,7 +6918,7 @@ }, { "id": "Italy_Umbria", - "s": 21530232, + "s": 17347811, "affiliations": [ "Italia", "Umbria" @@ -6932,7 +6932,7 @@ "g": [ { "id": "Italy_Veneto_Belluno", - "s": 12577472, + "s": 11808110, "affiliations": [ "Italia", "Veneto" @@ -6943,7 +6943,7 @@ }, { "id": "Italy_Veneto_Padova", - "s": 25380930, + "s": 21919521, "affiliations": [ "Italia", "Veneto" @@ -6954,7 +6954,7 @@ }, { "id": "Italy_Veneto_Rovigo", - "s": 9089380, + "s": 8020110, "affiliations": [ "Italia", "Veneto" @@ -6965,7 +6965,7 @@ }, { "id": "Italy_Veneto_Treviso", - "s": 32654388, + "s": 29230436, "affiliations": [ "Italia", "Veneto" @@ -6976,7 +6976,7 @@ }, { "id": "Italy_Veneto_Venezia", - "s": 20898278, + "s": 18097901, "affiliations": [ "Italia", "Veneto" @@ -6987,7 +6987,7 @@ }, { "id": "Italy_Veneto_Verona", - "s": 28622058, + "s": 25691958, "affiliations": [ "Italia", "Veneto" @@ -6998,7 +6998,7 @@ }, { "id": "Italy_Veneto_Vicenza", - "s": 28592632, + "s": 25225211, "affiliations": [ "Italia", "Veneto" @@ -7013,7 +7013,7 @@ }, { "id": "Jamaica", - "s": 8539019, + "s": 5510984, "affiliations": [ "Jamaica" ], @@ -7029,7 +7029,7 @@ "g": [ { "id": "Japan_Chubu Region_Aichi_Nagoya", - "s": 69173420, + "s": 23332562, "affiliations": [ "\u65e5\u672c", "\u4e09\u91cd\u770c", @@ -7041,7 +7041,7 @@ }, { "id": "Japan_Chubu Region_Aichi_Toyohashi", - "s": 24102795, + "s": 11241319, "affiliations": [ "\u65e5\u672c", "\u611b\u77e5\u770c" @@ -7052,7 +7052,7 @@ }, { "id": "Japan_Chubu Region_Fukui", - "s": 17254574, + "s": 8717405, "affiliations": [ "\u65e5\u672c", "\u798f\u4e95\u770c" @@ -7063,7 +7063,7 @@ }, { "id": "Japan_Chubu Region_Gifu", - "s": 35605973, + "s": 16793891, "affiliations": [ "\u65e5\u672c", "\u5c90\u961c\u770c" @@ -7074,7 +7074,7 @@ }, { "id": "Japan_Chubu Region_Ishikawa", - "s": 18493464, + "s": 8646014, "affiliations": [ "\u65e5\u672c", "\u77f3\u5ddd\u770c" @@ -7085,7 +7085,7 @@ }, { "id": "Japan_Chubu Region_Nagano", - "s": 45616153, + "s": 23032535, "affiliations": [ "\u9577\u91ce\u770c", "\u65e5\u672c" @@ -7096,7 +7096,7 @@ }, { "id": "Japan_Chubu Region_Niigata", - "s": 48195203, + "s": 22857598, "affiliations": [ "\u65e5\u672c", "\u65b0\u6f5f\u770c", @@ -7108,7 +7108,7 @@ }, { "id": "Japan_Chubu Region_Shizuoka", - "s": 67752210, + "s": 35527111, "affiliations": [ "\u9759\u5ca1\u770c", "\u65e5\u672c" @@ -7119,7 +7119,7 @@ }, { "id": "Japan_Chubu Region_Toyama", - "s": 18479050, + "s": 7571330, "affiliations": [ "\u65e5\u672c", "\u5bcc\u5c71\u770c", @@ -7131,7 +7131,7 @@ }, { "id": "Japan_Chubu Region_Yamanashi", - "s": 20111971, + "s": 11334725, "affiliations": [ "\u65e5\u672c", "\u5c71\u68a8\u770c" @@ -7147,7 +7147,7 @@ "g": [ { "id": "Japan_Chugoku Region_Hiroshima", - "s": 43511296, + "s": 25489855, "affiliations": [ "\u65e5\u672c", "\u5e83\u5cf6\u770c" @@ -7158,7 +7158,7 @@ }, { "id": "Japan_Chugoku Region_Okayama", - "s": 31077565, + "s": 15754130, "affiliations": [ "\u65e5\u672c", "\u5ca1\u5c71\u770c" @@ -7169,7 +7169,7 @@ }, { "id": "Japan_Chugoku Region_Shimane", - "s": 18593883, + "s": 12496747, "affiliations": [ "\u65e5\u672c", "\u5cf6\u6839\u770c" @@ -7180,7 +7180,7 @@ }, { "id": "Japan_Chugoku Region_Tottori", - "s": 20818418, + "s": 13283418, "affiliations": [ "\u9ce5\u53d6\u770c", "\u65e5\u672c" @@ -7191,7 +7191,7 @@ }, { "id": "Japan_Chugoku Region_Yamaguchi", - "s": 21793140, + "s": 13432869, "affiliations": [ "\u65e5\u672c", "\u5c71\u53e3\u770c" @@ -7207,7 +7207,7 @@ "g": [ { "id": "Japan_Hokkaido Region_East", - "s": 24831527, + "s": 16146020, "affiliations": [ "\u65e5\u672c", "\u5317\u6d77\u9053" @@ -7218,7 +7218,7 @@ }, { "id": "Japan_Hokkaido Region_North", - "s": 37030920, + "s": 26557893, "affiliations": [ "\u65e5\u672c", "\u5317\u6d77\u9053" @@ -7229,7 +7229,7 @@ }, { "id": "Japan_Hokkaido Region_West", - "s": 19700324, + "s": 13031764, "affiliations": [ "\u65e5\u672c", "\u5317\u6d77\u9053" @@ -7240,7 +7240,7 @@ }, { "id": "Japan_Hokkaido Region_Sapporo", - "s": 53873708, + "s": 31906699, "affiliations": [ "\u65e5\u672c", "\u5317\u6d77\u9053" @@ -7256,7 +7256,7 @@ "g": [ { "id": "Japan_Kanto_Chiba", - "s": 62144802, + "s": 24081937, "affiliations": [ "\u65e5\u672c", "\u5343\u8449\u770c", @@ -7269,7 +7269,7 @@ }, { "id": "Japan_Kanto_Gunma", - "s": 37584073, + "s": 14692659, "affiliations": [ "\u65e5\u672c", "\u7fa4\u99ac\u770c" @@ -7280,7 +7280,7 @@ }, { "id": "Japan_Kanto_Ibaraki", - "s": 42961854, + "s": 16523937, "affiliations": [ "\u8328\u57ce\u770c", "\u65e5\u672c", @@ -7293,7 +7293,7 @@ }, { "id": "Japan_Kanto_Kanagawa", - "s": 70714704, + "s": 32409329, "affiliations": [ "\u9759\u5ca1\u770c", "\u65e5\u672c", @@ -7307,7 +7307,7 @@ }, { "id": "Japan_Kanto_Saitama", - "s": 69392033, + "s": 20179436, "affiliations": [ "\u65e5\u672c", "\u57fc\u7389\u770c" @@ -7318,7 +7318,7 @@ }, { "id": "Japan_Kanto_Tochigi", - "s": 36012349, + "s": 14660304, "affiliations": [ "\u65e5\u672c", "\u6803\u6728\u770c" @@ -7329,7 +7329,7 @@ }, { "id": "Japan_Kanto_Tokyo", - "s": 85308337, + "s": 36526721, "affiliations": [ "\u9759\u5ca1\u770c", "\u65e5\u672c", @@ -7346,7 +7346,7 @@ "g": [ { "id": "Japan_Kinki Region_Mie", - "s": 28040864, + "s": 14085611, "affiliations": [ "\u65e5\u672c", "\u4e09\u91cd\u770c", @@ -7358,7 +7358,7 @@ }, { "id": "Japan_Kinki Region_Nara", - "s": 16880171, + "s": 9646032, "affiliations": [ "\u65e5\u672c", "\u5948\u826f\u770c", @@ -7370,7 +7370,7 @@ }, { "id": "Japan_Kinki Region_Osaka_Osaka", - "s": 59014994, + "s": 27691799, "affiliations": [ "\u65e5\u672c", "\u5175\u5eab\u770c", @@ -7382,7 +7382,7 @@ }, { "id": "Japan_Kinki Region_Osaka_West", - "s": 40728562, + "s": 21174815, "affiliations": [ "\u65e5\u672c", "\u5175\u5eab\u770c" @@ -7393,7 +7393,7 @@ }, { "id": "Japan_Kinki Region_Wakayama", - "s": 12937837, + "s": 8011496, "affiliations": [ "\u65e5\u672c", "\u548c\u6b4c\u5c71\u770c" @@ -7409,7 +7409,7 @@ "g": [ { "id": "Japan_Kyushu Region_Fukuoka", - "s": 42828767, + "s": 16484438, "affiliations": [ "\u65e5\u672c", "\u798f\u5ca1\u770c" @@ -7420,7 +7420,7 @@ }, { "id": "Japan_Kyushu Region_Kagoshima", - "s": 34813437, + "s": 18194307, "affiliations": [ "\u65e5\u672c", "\u9e7f\u5150\u5cf6\u770c" @@ -7431,7 +7431,7 @@ }, { "id": "Japan_Kyushu Region_Kumamoto", - "s": 36538523, + "s": 21686287, "affiliations": [ "\u65e5\u672c", "\u718a\u672c\u770c" @@ -7442,7 +7442,7 @@ }, { "id": "Japan_Kyushu Region_Miyazaki", - "s": 20021965, + "s": 10765110, "affiliations": [ "\u65e5\u672c", "\u5bae\u5d0e\u770c" @@ -7453,7 +7453,7 @@ }, { "id": "Japan_Kyushu Region_Nagasaki", - "s": 18297933, + "s": 11453772, "affiliations": [ "\u9577\u5d0e\u770c", "\u65e5\u672c" @@ -7464,7 +7464,7 @@ }, { "id": "Japan_Kyushu Region_Oita", - "s": 22150182, + "s": 13126443, "affiliations": [ "\u65e5\u672c", "\u5927\u5206\u770c" @@ -7475,7 +7475,7 @@ }, { "id": "Japan_Kyushu Region_Okinawa", - "s": 16262733, + "s": 7158681, "affiliations": [ "\u65e5\u672c", "\u6c96\u7e04\u770c" @@ -7486,7 +7486,7 @@ }, { "id": "Japan_Kyushu Region_Saga", - "s": 14572538, + "s": 7554049, "affiliations": [ "\u65e5\u672c", "\u4f50\u8cc0\u770c" @@ -7502,7 +7502,7 @@ "g": [ { "id": "Japan_Shikoku Region_Ehime", - "s": 26375399, + "s": 14580892, "affiliations": [ "\u65e5\u672c", "\u611b\u5a9b\u770c" @@ -7513,7 +7513,7 @@ }, { "id": "Japan_Shikoku Region_Kagawa", - "s": 12217411, + "s": 5727249, "affiliations": [ "\u9999\u5ddd\u770c", "\u65e5\u672c" @@ -7524,7 +7524,7 @@ }, { "id": "Japan_Shikoku Region_Kochi", - "s": 15151572, + "s": 10623493, "affiliations": [ "\u9ad8\u77e5\u770c", "\u65e5\u672c" @@ -7535,7 +7535,7 @@ }, { "id": "Japan_Shikoku Region_Kyoto", - "s": 49269267, + "s": 25277650, "affiliations": [ "\u65e5\u672c", "\u4eac\u90fd\u5e9c", @@ -7547,7 +7547,7 @@ }, { "id": "Japan_Shikoku Region_Tokushima", - "s": 16921005, + "s": 10111635, "affiliations": [ "\u65e5\u672c", "\u5fb3\u5cf6\u770c" @@ -7563,7 +7563,7 @@ "g": [ { "id": "Japan_Tohoku_Akita", - "s": 26392515, + "s": 15509945, "affiliations": [ "\u65e5\u672c", "\u79cb\u7530\u770c" @@ -7574,7 +7574,7 @@ }, { "id": "Japan_Tohoku_Aomori", - "s": 23859048, + "s": 12745901, "affiliations": [ "\u9752\u68ee\u770c", "\u65e5\u672c" @@ -7585,7 +7585,7 @@ }, { "id": "Japan_Tohoku_Fukushima", - "s": 52266139, + "s": 31413142, "affiliations": [ "\u65e5\u672c", "\u798f\u5cf6\u770c" @@ -7596,7 +7596,7 @@ }, { "id": "Japan_Tohoku_Iwate", - "s": 30985092, + "s": 19881156, "affiliations": [ "\u65e5\u672c", "\u5ca9\u624b\u770c" @@ -7607,7 +7607,7 @@ }, { "id": "Japan_Tohoku_Miyagi", - "s": 29824827, + "s": 15576664, "affiliations": [ "\u65e5\u672c", "\u5bae\u57ce\u770c", @@ -7619,7 +7619,7 @@ }, { "id": "Japan_Tohoku_Yamagata", - "s": 23679050, + "s": 11700607, "affiliations": [ "\u65e5\u672c", "\u5c71\u5f62\u770c" @@ -7634,7 +7634,7 @@ }, { "id": "Jersey", - "s": 1543535, + "s": 1093765, "affiliations": [ "France", "Guernsey", @@ -7653,7 +7653,7 @@ }, { "id": "Jordan", - "s": 22502360, + "s": 8444050, "affiliations": [ "Ajloun", "Amman", @@ -7678,7 +7678,7 @@ "g": [ { "id": "Kazakhstan_North", - "s": 40229911, + "s": 30556315, "affiliations": [ "\u0410\u0441\u0442\u0430\u043d\u0430", "\u0421\u0435\u0432\u0435\u0440\u043e-\u041a\u0430\u0437\u0430\u0445\u0441\u0442\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", @@ -7694,7 +7694,7 @@ }, { "id": "Kazakhstan_South", - "s": 54843574, + "s": 37088147, "affiliations": [ "\u0410\u043b\u043c\u0430\u0442\u044b", "\u0410\u0442\u044b\u0440\u0430\u0443\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", @@ -7716,7 +7716,7 @@ }, { "id": "Kenya", - "s": 41220783, + "s": 32522543, "affiliations": [ "Baringo", "Bungoma", @@ -7773,7 +7773,7 @@ }, { "id": "Kingdom of Lesotho", - "s": 63279366, + "s": 62456215, "affiliations": [ "Lesotho" ], @@ -7783,7 +7783,7 @@ }, { "id": "Kiribati", - "s": 1037863, + "s": 1012682, "affiliations": [ "Kiribati" ], @@ -7793,7 +7793,7 @@ }, { "id": "Kuwait", - "s": 13951221, + "s": 8374655, "affiliations": [ "\u062d\u0648\u0644\u064a", "\u0645\u0628\u0627\u0631\u0643 \u0627\u0644\u0643\u0628\u064a\u0631\u200e", @@ -7809,7 +7809,7 @@ }, { "id": "Kyrgyzstan", - "s": 30442350, + "s": 19725213, "affiliations": [ "\u041d\u0430\u0440\u044b\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0422\u0430\u043b\u0430\u0441\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", @@ -7830,7 +7830,7 @@ }, { "id": "Laos", - "s": 12795548, + "s": 10572328, "affiliations": [ "\u0e84\u0ecd\u0eb2\u0ea1\u0ec8\u0ea7\u0e99", "\u0e88\u0eb3\u0e9b\u0eb2\u0eaa\u0eb1\u0e81", @@ -7857,7 +7857,7 @@ }, { "id": "Latvia", - "s": 61891781, + "s": 49493562, "affiliations": [ "Latgale", "Latvija", @@ -7871,7 +7871,7 @@ }, { "id": "Lebanon", - "s": 10214403, + "s": 6027941, "affiliations": [ "\u0627\u0644\u062c\u0645\u0647\u0648\u0631\u064a\u0629 \u0627\u0644\u0644\u0628\u0646\u0627\u0646\u064a\u0629", "\u0642\u0636\u0627\u0621 \u0632\u063a\u0631\u062a\u0627", @@ -7906,7 +7906,7 @@ }, { "id": "Liberia", - "s": 17517682, + "s": 16168393, "affiliations": [ "Bomi County", "Bong County", @@ -7931,7 +7931,7 @@ }, { "id": "Libya", - "s": 22775748, + "s": 9844736, "affiliations": [ "Libya \u2d4d\u2d49\u2d31\u2d62\u2d30 \u0644\u064a\u0628\u064a\u0627", "\u0633\u0631\u062a", @@ -7963,7 +7963,7 @@ }, { "id": "Liechtenstein", - "s": 1567489, + "s": 1388866, "affiliations": [ "Liechtenstein" ], @@ -7976,7 +7976,7 @@ "g": [ { "id": "Lithuania_East", - "s": 50515666, + "s": 41001639, "affiliations": [ "Alytaus apskritis", "Kauno apskritis", @@ -7990,7 +7990,7 @@ }, { "id": "Lithuania_West", - "s": 50699410, + "s": 41388410, "affiliations": [ "Klaip\u0117dos apskritis", "Lietuva", @@ -8008,7 +8008,7 @@ }, { "id": "Luxembourg", - "s": 17023860, + "s": 14787929, "affiliations": [ "L\u00ebtzebuerg" ], @@ -8018,7 +8018,7 @@ }, { "id": "Macedonia", - "s": 18349903, + "s": 14382954, "affiliations": [ "\u0418\u0441\u0442\u043e\u0447\u0435\u043d \u0420\u0435\u0433\u0438\u043e\u043d", "\u041f\u043e\u043b\u043e\u0448\u043a\u0438 \u0420\u0435\u0433\u0438\u043e\u043d", @@ -8036,7 +8036,7 @@ }, { "id": "Madagascar", - "s": 39960872, + "s": 34300993, "affiliations": [ "Madagasikara", "Region de Anosy", @@ -8050,7 +8050,7 @@ }, { "id": "Malawi", - "s": 51632213, + "s": 39051338, "affiliations": [ "Border Malawi - Mozambique", "Central", @@ -8066,7 +8066,7 @@ }, { "id": "Malaysia", - "s": 72898947, + "s": 40433656, "affiliations": [ "Terengganu / \u062a\u0631\u06a0\u06ac\u0627\u0646\u0648", "Johor", @@ -8112,7 +8112,7 @@ }, { "id": "Maldives", - "s": 2329560, + "s": 1379279, "affiliations": [ "Mathi-Dhekunu Province", "Mathi-Uthuru Province", @@ -8131,7 +8131,7 @@ }, { "id": "Mali", - "s": 47663393, + "s": 27817269, "affiliations": [ "District de Bamako", "Gao", @@ -8150,7 +8150,7 @@ }, { "id": "Malta", - "s": 4728831, + "s": 3022519, "affiliations": [ "Comino", "Cominotto", @@ -8167,7 +8167,7 @@ }, { "id": "Marshall Islands", - "s": 784198, + "s": 748522, "affiliations": [ "Aolep\u0101n Aor\u014dkin M\u0327aje\u013c", "MH" @@ -8178,7 +8178,7 @@ }, { "id": "Mauritania", - "s": 13153946, + "s": 5682700, "affiliations": [ "\u0646\u0648\u0627\u0643\u0634\u0648\u0637", "Mauritanie \u0645\u0648\u0631\u064a\u062a\u0627\u0646\u064a\u0627", @@ -8200,7 +8200,7 @@ }, { "id": "Mauritius", - "s": 4453061, + "s": 2988345, "affiliations": [ "Black River", "Mauritius", @@ -8238,7 +8238,7 @@ "g": [ { "id": "Mexico_California", - "s": 21562223, + "s": 8372271, "affiliations": [ "Baja California", "Baja California Sur", @@ -8254,7 +8254,7 @@ }, { "id": "Mexico_Central_East", - "s": 56410454, + "s": 14821477, "affiliations": [ "Coahuila de Zaragoza", "Estados Unidos Mexicanos", @@ -8268,7 +8268,7 @@ }, { "id": "Mexico_Central_West", - "s": 66999156, + "s": 25406870, "affiliations": [ "Aguascalientes", "Colima", @@ -8285,7 +8285,7 @@ }, { "id": "Mexico_East", - "s": 48377914, + "s": 17054690, "affiliations": [ "Campeche", "Chiapas", @@ -8303,7 +8303,7 @@ }, { "id": "Mexico_Mexico", - "s": 90518955, + "s": 31234999, "affiliations": [ "Distrito Federal", "Estados Unidos Mexicanos", @@ -8320,7 +8320,7 @@ }, { "id": "Mexico_Chihuahua", - "s": 38087148, + "s": 11300293, "affiliations": [ "Chihuahua", "Coahuila de Zaragoza", @@ -8335,7 +8335,7 @@ }, { "id": "Mexico_Sonora", - "s": 34553161, + "s": 10101242, "affiliations": [ "Chihuahua", "Durango", @@ -8349,7 +8349,7 @@ }, { "id": "Mexico_South", - "s": 69142990, + "s": 27604136, "affiliations": [ "Estados Unidos Mexicanos", "Guerrero", @@ -8367,7 +8367,7 @@ }, { "id": "Moldova", - "s": 35376379, + "s": 22893109, "affiliations": [ "G\u0103g\u0103uzia - Gagauz Yeri - \u0413\u0430\u0433\u0430\u0443\u0437\u0438\u044f", "Moldova", @@ -8379,7 +8379,7 @@ }, { "id": "Monaco", - "s": 259998, + "s": 227276, "affiliations": [ "France", "Monaco" @@ -8390,7 +8390,7 @@ }, { "id": "Mongolia", - "s": 19811046, + "s": 15155954, "affiliations": [ "Border Darkhan-Uul - Selenge", "\u0423\u0432\u0441 \u0430\u0439\u043c\u0430\u0433", @@ -8425,7 +8425,7 @@ }, { "id": "Montenegro", - "s": 18357099, + "s": 16331735, "affiliations": [ "Crna Gora" ], @@ -8438,7 +8438,7 @@ "g": [ { "id": "Morocco_Western Sahara", - "s": 7457146, + "s": 5365305, "affiliations": [ "Dakhla-Oued Ed-Dahab \u2d37\u2d30\u2d45\u2d4d\u2d30-\u2d61\u2d30\u2d37 \u2d37\u2d30\u2d40\u2d30\u2d31 \u0627\u0644\u062f\u0627\u062e\u0644\u0629-\u0648\u0627\u062f\u064a \u0627\u0644\u0630\u0647\u0628", "Guelmim-Oued Noun \u2d33\u2d4d\u2d4e\u2d49\u2d4e-\u2d61\u2d30\u2d37 \u2d4f\u2d53\u2d4f \u06af\u0644\u0645\u064a\u0645 - \u0648\u0627\u062f \u0646\u0648\u0646", @@ -8453,7 +8453,7 @@ }, { "id": "Morocco_Southern", - "s": 38669974, + "s": 26615728, "affiliations": [ "B\u00e9ni Mellal-Kh\u00e9nifra \u2d30\u2d62\u2d5c \u2d4e\u2d4d\u2d4d\u2d30\u2d4d-\u2d45\u2d4f\u2d49\u2d3c\u2d55\u2d30 \u0628\u0646\u064a \u0645\u0644\u0627\u0644-\u062e\u0646\u064a\u0641\u0631\u0629", "Dr\u00e2a-Tafilalet \u2d37\u2d30\u2d54\u2d44\u2d30-\u2d5c\u2d30\u2d3c\u2d49\u2d4d\u2d30\u2d4d\u2d5c \u062f\u0631\u0639\u0629-\u062a\u0627\u0641\u064a\u0644\u0627\u0644\u062a", @@ -8469,7 +8469,7 @@ }, { "id": "Morocco_Doukkala-Abda", - "s": 30875054, + "s": 16530646, "affiliations": [ "B\u00e9ni Mellal-Kh\u00e9nifra \u2d30\u2d62\u2d5c \u2d4e\u2d4d\u2d4d\u2d30\u2d4d-\u2d45\u2d4f\u2d49\u2d3c\u2d55\u2d30 \u0628\u0646\u064a \u0645\u0644\u0627\u0644-\u062e\u0646\u064a\u0641\u0631\u0629", "Casablanca-Settat \u2d5c\u2d49\u2d33\u2d4e\u2d49 \u2d5c\u2d53\u2d4e\u2d4d\u2d49\u2d4d\u2d5c-\u2d59\u2d5f\u2d5f\u2d30\u2d5c \u0627\u0644\u062f\u0627\u0631 \u0627\u0644\u0628\u064a\u0636\u0627\u0621-\u0633\u0637\u0627\u062a", @@ -8482,7 +8482,7 @@ }, { "id": "Morocco_Rabat-Sale-Zemmour-Zaer", - "s": 21505686, + "s": 13050793, "affiliations": [ "F\u00e8s-Mekn\u00e8s \u2d3c\u2d30\u2d59-\u2d4e\u2d3d\u2d4f\u2d30\u2d59 \u0641\u0627\u0633-\u0645\u0643\u0646\u0627\u0633", "Maroc \u2d4d\u2d4e\u2d56\u2d54\u2d49\u2d31 \u0627\u0644\u0645\u063a\u0631\u0628", @@ -8498,7 +8498,7 @@ }, { "id": "Mozambique", - "s": 97909693, + "s": 79853101, "affiliations": [ "Cabo Delgado", "Gaza", @@ -8518,7 +8518,7 @@ }, { "id": "Myanmar", - "s": 57290515, + "s": 33846355, "affiliations": [ "Ayeyarwady", "Bago Region", @@ -8543,7 +8543,7 @@ }, { "id": "Namibia", - "s": 16858719, + "s": 13481783, "affiliations": [ "Arandis", "Aranos7", @@ -8575,7 +8575,7 @@ }, { "id": "Nauru", - "s": 285400, + "s": 274190, "affiliations": [ "Naoero" ], @@ -8588,7 +8588,7 @@ "g": [ { "id": "Nepal_West", - "s": 54784648, + "s": 52301521, "affiliations": [ "\u092e\u0927\u094d\u092f-\u092a\u0936\u094d\u091a\u093f\u092e\u093e\u091e\u094d\u091a\u0932 \u0935\u093f\u0915\u093e\u0938 \u0915\u094d\u0937\u0947\u0924\u094d\u0930", "\u0928\u0947\u092a\u093e\u0932", @@ -8601,7 +8601,7 @@ }, { "id": "Nepal_Kathmandu", - "s": 28888631, + "s": 26120306, "affiliations": [ "\u092e\u0927\u094d\u092f\u092e\u093e\u091e\u094d\u091a\u0932 \u0935\u093f\u0915\u093e\u0938 \u0915\u094d\u0937\u0947\u0924\u094d\u0930", "\u0928\u0947\u092a\u093e\u0932" @@ -8612,7 +8612,7 @@ }, { "id": "Nepal_Madhyamanchal", - "s": 26177148, + "s": 23015469, "affiliations": [ "\u092e\u0927\u094d\u092f\u092e\u093e\u091e\u094d\u091a\u0932 \u0935\u093f\u0915\u093e\u0938 \u0915\u094d\u0937\u0947\u0924\u094d\u0930", "\u0928\u0947\u092a\u093e\u0932" @@ -8623,7 +8623,7 @@ }, { "id": "Nepal_Purwanchal", - "s": 12928328, + "s": 11527130, "affiliations": [ "\u092a\u0941\u0930\u094d\u0935\u093e\u091e\u094d\u091a\u0932 \u0935\u093f\u0915\u093e\u0938 \u0915\u094d\u0937\u0947\u0924\u094d\u0930", "\u0928\u0947\u092a\u093e\u0932" @@ -8636,7 +8636,7 @@ }, { "id": "Nicaragua", - "s": 19067949, + "s": 12308703, "affiliations": [ "Boaco", "Carazo", @@ -8664,7 +8664,7 @@ }, { "id": "Niger", - "s": 20867479, + "s": 13001395, "affiliations": [ "Agadez", "Dosso", @@ -8685,7 +8685,7 @@ "g": [ { "id": "Nigeria_South", - "s": 75123321, + "s": 34174237, "affiliations": [ "Abia", "Adamawa", @@ -8723,7 +8723,7 @@ }, { "id": "Nigeria_North", - "s": 47475061, + "s": 25701238, "affiliations": [ "Bauchi", "Borno", @@ -8746,7 +8746,7 @@ }, { "id": "Niue", - "s": 205152, + "s": 194947, "affiliations": [ "Niu\u0113" ], @@ -8756,7 +8756,7 @@ }, { "id": "North Korea", - "s": 20701826, + "s": 14705024, "affiliations": [ "\uac15\uc6d0\ub3c4", "\ub7c9\uac15\ub3c4", @@ -8780,7 +8780,7 @@ "g": [ { "id": "Norway_Northern", - "s": 43289564, + "s": 48206821, "affiliations": [ "Finnmark", "Norge", @@ -8792,7 +8792,7 @@ }, { "id": "Norway_Hordaland", - "s": 46534038, + "s": 44515185, "affiliations": [ "Hordaland", "Norge" @@ -8803,7 +8803,7 @@ }, { "id": "Norway_Nordland", - "s": 30767692, + "s": 28210913, "affiliations": [ "Nordland", "Norge", @@ -8815,7 +8815,7 @@ }, { "id": "Norway_Svalbard", - "s": 1334408, + "s": 1364494, "affiliations": [ "Norge", "Svalbard" @@ -8826,7 +8826,7 @@ }, { "id": "Norway_Oppland", - "s": 38557669, + "s": 36215261, "affiliations": [ "Norge", "Oppland" @@ -8837,7 +8837,7 @@ }, { "id": "Norway_Rogaland", - "s": 22471209, + "s": 20176230, "affiliations": [ "Norge", "Rogaland" @@ -8848,7 +8848,7 @@ }, { "id": "Norway_Hedmark", - "s": 40888615, + "s": 38687427, "affiliations": [ "Hedmark", "Norge" @@ -8859,7 +8859,7 @@ }, { "id": "Norway_Jan Mayen", - "s": 201753, + "s": 202709, "affiliations": [ "Jan Mayen", "Norge" @@ -8867,7 +8867,7 @@ }, { "id": "Norway_North Trondelag", - "s": 47938127, + "s": 47586934, "affiliations": [ "Nord-Tr\u00f8ndelag", "Norge", @@ -8879,7 +8879,7 @@ }, { "id": "Norway_South Trondelag", - "s": 53651983, + "s": 52242167, "affiliations": [ "Norge", "S\u00f8r-Tr\u00f8ndelag" @@ -8890,7 +8890,7 @@ }, { "id": "Norway_Southern", - "s": 69949925, + "s": 63082930, "affiliations": [ "Aust-Agder", "\u00d8stfold", @@ -8905,7 +8905,7 @@ }, { "id": "Norway_Western", - "s": 59666639, + "s": 58023495, "affiliations": [ "M\u00f8re og Romsdal", "Norge", @@ -8917,7 +8917,7 @@ }, { "id": "Norway_Central", - "s": 62411223, + "s": 55982084, "affiliations": [ "Akershus", "Buskerud", @@ -8930,7 +8930,7 @@ }, { "id": "Norway_Bouvet Island", - "s": 20128, + "s": 20447, "affiliations": [ "Bouvet\u00f8ya", "Norge" @@ -8943,7 +8943,7 @@ }, { "id": "Oman", - "s": 16313417, + "s": 9284923, "affiliations": [ "\u0645\u0646\u0637\u0642\u0629 \u0627\u0644\u0638\u0627\u0647\u0631\u0629", "\u0645\u0646\u0637\u0642\u0629 \u0627\u0644\u062f\u0627\u062e\u0644\u064a\u0629", @@ -8963,7 +8963,7 @@ }, { "id": "Pakistan", - "s": 64762292, + "s": 30912243, "affiliations": [ "\u0633\u0646\u068c", "\u0622\u0632\u0627\u062f \u062c\u0645\u0648\u06ba \u0648 \u06a9\u0634\u0645\u06cc\u0631", @@ -8981,7 +8981,7 @@ }, { "id": "Palau", - "s": 447981, + "s": 417072, "affiliations": [ "Belau", "PW" @@ -8992,7 +8992,7 @@ }, { "id": "Panama", - "s": 13112883, + "s": 8960311, "affiliations": [ "Bocas del Toro", "Chiriqu\u00ed", @@ -9019,7 +9019,7 @@ }, { "id": "Papua New Guinea", - "s": 6985066, + "s": 6394139, "affiliations": [ "Border Central-NCD", "Bougainville", @@ -9052,7 +9052,7 @@ }, { "id": "Paraguay", - "s": 35159793, + "s": 18487587, "affiliations": [ "Alto Paraguay", "Alto Paran\u00e1", @@ -9085,7 +9085,7 @@ "g": [ { "id": "China_Anhui", - "s": 16558285, + "s": 10446768, "affiliations": [ "\u4e2d\u56fd", "\u5b89\u5fbd\u7701" @@ -9096,7 +9096,7 @@ }, { "id": "China_Chongqing", - "s": 6997734, + "s": 6315456, "affiliations": [ "\u91cd\u5e86\u5e02", "\u4e2d\u56fd" @@ -9107,7 +9107,7 @@ }, { "id": "China_Fujian", - "s": 12386036, + "s": 9429679, "affiliations": [ "\u4e2d\u56fd", "\u798f\u5efa\u7701" @@ -9118,7 +9118,7 @@ }, { "id": "China_Gansu", - "s": 16878694, + "s": 12727665, "affiliations": [ "\u4e2d\u56fd", "\u7518\u8083\u7701" @@ -9129,7 +9129,7 @@ }, { "id": "China_Guangdong", - "s": 68061433, + "s": 48695840, "affiliations": [ "\u4e2d\u56fd", "\u5e7f\u4e1c\u7701", @@ -9141,7 +9141,7 @@ }, { "id": "China_Guangxi", - "s": 10290150, + "s": 8551782, "affiliations": [ "\u5e7f\u897f\u58ee\u65cf\u81ea\u6cbb\u533a", "\u4e2d\u56fd" @@ -9152,7 +9152,7 @@ }, { "id": "China_Guizhou", - "s": 7077840, + "s": 6244708, "affiliations": [ "\u8d35\u5dde\u7701", "\u4e2d\u56fd" @@ -9163,7 +9163,7 @@ }, { "id": "China_Hebei", - "s": 34877984, + "s": 21352900, "affiliations": [ "\u4e2d\u56fd", "\u5317\u4eac\u5e02", @@ -9176,7 +9176,7 @@ }, { "id": "China_Heilongjiang", - "s": 11302911, + "s": 7243153, "affiliations": [ "\u4e2d\u56fd", "\u9ed1\u9f99\u6c5f\u7701" @@ -9187,7 +9187,7 @@ }, { "id": "China_Henan", - "s": 14356176, + "s": 7937484, "affiliations": [ "\u4e2d\u56fd", "\u6cb3\u5357\u7701" @@ -9198,7 +9198,7 @@ }, { "id": "China_Hubei", - "s": 12449638, + "s": 9089313, "affiliations": [ "Border Henan - Hubei", "\u4e2d\u56fd", @@ -9210,7 +9210,7 @@ }, { "id": "China_Hunan", - "s": 11967093, + "s": 9637693, "affiliations": [ "\u4e2d\u56fd", "\u6e56\u5357\u7701" @@ -9221,7 +9221,7 @@ }, { "id": "China_Inner Mongolia", - "s": 16698214, + "s": 10616741, "affiliations": [ "\u4e2d\u56fd", "\u5185\u8499\u53e4\u81ea\u6cbb\u533a / Inner Mongolia" @@ -9232,7 +9232,7 @@ }, { "id": "China_Jiangsu", - "s": 45340568, + "s": 24559477, "affiliations": [ "\u4e2d\u56fd", "\u6c5f\u82cf\u7701", @@ -9244,7 +9244,7 @@ }, { "id": "China_Jiangxi", - "s": 13008963, + "s": 9190871, "affiliations": [ "\u4e2d\u56fd", "\u6c5f\u897f\u7701" @@ -9255,7 +9255,7 @@ }, { "id": "China_Jilin", - "s": 11741540, + "s": 7271360, "affiliations": [ "\u4e2d\u56fd", "\u5409\u6797\u7701" @@ -9266,7 +9266,7 @@ }, { "id": "China_Liaoning", - "s": 13045253, + "s": 8965177, "affiliations": [ "\u8fbd\u5b81\u7701", "\u4e2d\u56fd" @@ -9277,7 +9277,7 @@ }, { "id": "China_Ningxia Hui", - "s": 3967533, + "s": 2462872, "affiliations": [ "\u5b81\u590f\u56de\u65cf\u81ea\u6cbb\u533a", "\u4e2d\u56fd" @@ -9288,7 +9288,7 @@ }, { "id": "China_Qinghai", - "s": 8480150, + "s": 6971438, "affiliations": [ "\u9752\u6d77\u7701", "\u4e2d\u56fd" @@ -9299,7 +9299,7 @@ }, { "id": "China_Shaanxi", - "s": 14625667, + "s": 9708861, "affiliations": [ "\u9655\u897f\u7701", "\u4e2d\u56fd" @@ -9310,7 +9310,7 @@ }, { "id": "China_Shandong", - "s": 27599025, + "s": 14479911, "affiliations": [ "\u4e2d\u56fd", "\u5c71\u4e1c\u7701" @@ -9321,7 +9321,7 @@ }, { "id": "China_Shanghai", - "s": 15350075, + "s": 8998525, "affiliations": [ "\u4e2d\u56fd", "\u4e0a\u6d77\u5e02", @@ -9333,7 +9333,7 @@ }, { "id": "China_Shanxi", - "s": 8084937, + "s": 5681697, "affiliations": [ "\u4e2d\u56fd", "\u5c71\u897f\u7701" @@ -9344,7 +9344,7 @@ }, { "id": "China_Sichuan", - "s": 21443213, + "s": 20288484, "affiliations": [ "\u4e2d\u56fd", "\u56db\u5ddd\u7701" @@ -9355,7 +9355,7 @@ }, { "id": "China_Tibet Autonomous Region", - "s": 14946454, + "s": 13806611, "affiliations": [ "\u4e2d\u56fd", "\u897f\u85cf\u81ea\u6cbb\u533a (\u0f56\u0f7c\u0f51\u0f0b\u0f62\u0f44\u0f0b\u0f66\u0f90\u0fb1\u0f7c\u0f44\u0f0b\u0f63\u0f97\u0f7c\u0f44\u0f66\u0f0b)" @@ -9366,7 +9366,7 @@ }, { "id": "China_Xinjiang", - "s": 20189295, + "s": 13677073, "affiliations": [ "\u4e2d\u56fd", "\u65b0\u7586\u7ef4\u543e\u5c14\u81ea\u6cbb\u533a" @@ -9377,7 +9377,7 @@ }, { "id": "China_Yunnan", - "s": 21062083, + "s": 16360353, "affiliations": [ "\u4e2d\u56fd", "\u4e91\u5357\u7701" @@ -9388,7 +9388,7 @@ }, { "id": "China_Zhejiang", - "s": 26651489, + "s": 16648132, "affiliations": [ "\u4e2d\u56fd", "\u6d59\u6c5f\u7701" @@ -9404,7 +9404,7 @@ "g": [ { "id": "Taiwan_North", - "s": 51049105, + "s": 29382071, "affiliations": [ "\u4e2d\u56fd", "\u65b0\u5317\u5e02", @@ -9421,7 +9421,7 @@ }, { "id": "Taiwan_South", - "s": 55435130, + "s": 23823249, "affiliations": [ "\u9ad8\u96c4\u5e02", "\u53f0\u5357\u5e02", @@ -9439,7 +9439,7 @@ "g": [ { "id": "Peru_North", - "s": 39037014, + "s": 20896816, "affiliations": [ "Amazonas", "Ancash", @@ -9461,7 +9461,7 @@ }, { "id": "Peru_Lima", - "s": 38811897, + "s": 18241893, "affiliations": [ "Callao", "Huancavelica", @@ -9476,7 +9476,7 @@ }, { "id": "Peru_South", - "s": 34825112, + "s": 20105348, "affiliations": [ "Apur\u00edmac", "Arequipa", @@ -9499,7 +9499,7 @@ "g": [ { "id": "Philippines_Mindanao", - "s": 39958254, + "s": 27713345, "affiliations": [ "Agusan Del Sur", "Agusan del Norte", @@ -9540,7 +9540,7 @@ }, { "id": "Philippines_Visayas", - "s": 53361874, + "s": 44955529, "affiliations": [ "Aklan", "Bohol", @@ -9571,7 +9571,7 @@ }, { "id": "Philippines_Luzon_South", - "s": 8194087, + "s": 6897830, "affiliations": [ "Antique", "Ban Than (Zhongzhou) Reef", @@ -9594,7 +9594,7 @@ }, { "id": "Philippines_Luzon_Manila", - "s": 100095201, + "s": 78198112, "affiliations": [ "Catanduanes", "Cavite", @@ -9616,7 +9616,7 @@ }, { "id": "Philippines_Luzon_North", - "s": 62284260, + "s": 47158592, "affiliations": [ "Abra", "Cavite", @@ -9654,7 +9654,7 @@ }, { "id": "Pitcairn Islands", - "s": 61132, + "s": 58610, "affiliations": [ "Pitcairn Islands" ], @@ -9667,7 +9667,7 @@ "g": [ { "id": "Poland_West Pomeranian Voivodeship", - "s": 53957205, + "s": 49995675, "affiliations": [ "Polska", "Territorial waters of Bornholm", @@ -9679,7 +9679,7 @@ }, { "id": "Poland_Pomeranian Voivodeship", - "s": 57031568, + "s": 51275627, "affiliations": [ "Polska", "Territorial waters of Bornholm", @@ -9691,7 +9691,7 @@ }, { "id": "Poland_Podlaskie Voivodeship", - "s": 37896089, + "s": 36540071, "affiliations": [ "Polska", "wojew\u00f3dztwo podlaskie" @@ -9702,7 +9702,7 @@ }, { "id": "Poland_Masovian Voivodeship", - "s": 118933581, + "s": 108633207, "affiliations": [ "Polska", "wojew\u00f3dztwo mazowieckie" @@ -9713,7 +9713,7 @@ }, { "id": "Poland_Lubusz Voivodeship", - "s": 33600655, + "s": 31178538, "affiliations": [ "Polska", "wojew\u00f3dztwo lubuskie" @@ -9724,7 +9724,7 @@ }, { "id": "Poland_Lublin Voivodeship", - "s": 68443552, + "s": 65204709, "affiliations": [ "Polska", "wojew\u00f3dztwo lubelskie" @@ -9735,7 +9735,7 @@ }, { "id": "Poland_Lower Silesian Voivodeship", - "s": 90289358, + "s": 82134078, "affiliations": [ "Polska", "wojew\u00f3dztwo dolno\u015bl\u0105skie" @@ -9746,7 +9746,7 @@ }, { "id": "Poland_Warmian-Masurian Voivodeship", - "s": 42045304, + "s": 39674191, "affiliations": [ "Polska", "wojew\u00f3dztwo warmi\u0144sko-mazurskie" @@ -9757,7 +9757,7 @@ }, { "id": "Poland_Lodz Voivodeship", - "s": 66205524, + "s": 60026097, "affiliations": [ "Polska", "wojew\u00f3dztwo \u0142\u00f3dzkie" @@ -9768,7 +9768,7 @@ }, { "id": "Poland_Subcarpathian Voivodeship", - "s": 76642185, + "s": 72503087, "affiliations": [ "Polska", "wojew\u00f3dztwo podkarpackie" @@ -9779,7 +9779,7 @@ }, { "id": "Poland_Lesser Poland Voivodeship", - "s": 93661501, + "s": 86552349, "affiliations": [ "Polska", "wojew\u00f3dztwo ma\u0142opolskie" @@ -9790,7 +9790,7 @@ }, { "id": "Poland_Silesian Voivodeship", - "s": 104798175, + "s": 93763277, "affiliations": [ "Polska", "wojew\u00f3dztwo \u015bl\u0105skie" @@ -9801,7 +9801,7 @@ }, { "id": "Poland_Kuyavian-Pomeranian Voivodeship", - "s": 47587679, + "s": 43760679, "affiliations": [ "Polska", "wojew\u00f3dztwo kujawsko-pomorskie" @@ -9812,7 +9812,7 @@ }, { "id": "Poland_Greater Poland Voivodeship", - "s": 79880876, + "s": 72923589, "affiliations": [ "Polska", "wojew\u00f3dztwo wielkopolskie" @@ -9823,7 +9823,7 @@ }, { "id": "Poland_Opole Voivodeship", - "s": 33694411, + "s": 31027796, "affiliations": [ "Polska", "wojew\u00f3dztwo opolskie" @@ -9834,7 +9834,7 @@ }, { "id": "Poland_Swietokrzyskie Voivodeship", - "s": 45988424, + "s": 42944106, "affiliations": [ "Polska", "wojew\u00f3dztwo \u015bwi\u0119tokrzyskie" @@ -9850,7 +9850,7 @@ "g": [ { "id": "Portugal_Porto", - "s": 57457208, + "s": 36696964, "affiliations": [ "Centro", "Norte", @@ -9862,7 +9862,7 @@ }, { "id": "Portugal_South", - "s": 60763693, + "s": 42517053, "affiliations": [ "Centro", "Alentejo", @@ -9876,7 +9876,7 @@ }, { "id": "Portugal_Islands", - "s": 10386588, + "s": 8723407, "affiliations": [ "Ilh\u00e9u dos Rosais", "Ilh\u00e9us dos Rosais", @@ -9918,7 +9918,7 @@ }, { "id": "Portugal_Viseu", - "s": 45312294, + "s": 32227569, "affiliations": [ "Centro", "Norte", @@ -9932,7 +9932,7 @@ }, { "id": "Qatar", - "s": 7926415, + "s": 5059759, "affiliations": [ "Ad Dawhah", "Al Ghuwariyah", @@ -9952,7 +9952,7 @@ }, { "id": "Republic of Kosovo", - "s": 12005457, + "s": 8548650, "affiliations": [ "Republika e Kosov\u00ebs" ], @@ -9965,7 +9965,7 @@ "g": [ { "id": "Romania_South_East", - "s": 24086811, + "s": 17102434, "affiliations": [ "Br\u0103ila", "Buz\u0103u", @@ -9981,7 +9981,7 @@ }, { "id": "Romania_Centre", - "s": 41298412, + "s": 37209347, "affiliations": [ "Alba", "Bra\u0219ov", @@ -9997,7 +9997,7 @@ }, { "id": "Romania_West", - "s": 29485014, + "s": 25242960, "affiliations": [ "Arad", "Cara\u0219 Severin", @@ -10011,7 +10011,7 @@ }, { "id": "Romania_North_West", - "s": 38621090, + "s": 35078125, "affiliations": [ "Bihor", "Bistri\u021ba-N\u0103s\u0103ud", @@ -10027,7 +10027,7 @@ }, { "id": "Romania_South_West", - "s": 23331202, + "s": 18738171, "affiliations": [ "Dolj", "Gorj", @@ -10042,7 +10042,7 @@ }, { "id": "Romania_North_East", - "s": 33575536, + "s": 26426933, "affiliations": [ "Bac\u0103u", "Boto\u0219ani", @@ -10058,7 +10058,7 @@ }, { "id": "Romania_South", - "s": 41437350, + "s": 29153531, "affiliations": [ "Arge\u0219", "Bucure\u0219ti", @@ -10083,7 +10083,7 @@ "g": [ { "id": "Crimea", - "s": 29694146, + "s": 22391181, "affiliations": [ "\u0410\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u0430 \u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0456\u043a\u0430 \u041a\u0440\u0438\u043c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10098,7 +10098,7 @@ }, { "id": "Russia_Altai Krai", - "s": 33695336, + "s": 26741640, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10110,7 +10110,7 @@ }, { "id": "Russia_Altai Republic", - "s": 8557470, + "s": 7852937, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10122,7 +10122,7 @@ }, { "id": "Russia_Amur Oblast", - "s": 8505655, + "s": 6308732, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10134,7 +10134,7 @@ }, { "id": "Russia_Arkhangelsk Oblast_Central", - "s": 53567314, + "s": 50467736, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10146,7 +10146,7 @@ }, { "id": "Russia_Arkhangelsk Oblast_North", - "s": 22627948, + "s": 21420101, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10160,7 +10160,7 @@ }, { "id": "Russia_Astrakhan Oblast", - "s": 9119268, + "s": 6921914, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10172,7 +10172,7 @@ }, { "id": "Russia_Bashkortostan", - "s": 38051998, + "s": 29479170, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10184,7 +10184,7 @@ }, { "id": "Russia_Belgorod Oblast", - "s": 21693149, + "s": 17542021, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10196,7 +10196,7 @@ }, { "id": "Russia_Bryansk Oblast", - "s": 16017004, + "s": 12368088, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10208,7 +10208,7 @@ }, { "id": "Russia_Buryatia", - "s": 11164560, + "s": 9206328, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10220,7 +10220,7 @@ }, { "id": "Russia_Chechen Republic", - "s": 6114259, + "s": 3696734, "affiliations": [ "\u0427\u0435\u0447\u0435\u043d\u0441\u043a\u0430\u044f \u0440\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10232,7 +10232,7 @@ }, { "id": "Russia_Chelyabinsk Oblast", - "s": 49337241, + "s": 36760506, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10244,7 +10244,7 @@ }, { "id": "Russia_Chukotka Autonomous Okrug", - "s": 8231813, + "s": 8055542, "affiliations": [ "\u0427\u0443\u043a\u043e\u0442\u0441\u043a\u0438\u0439 \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u044b\u0439 \u043e\u043a\u0440\u0443\u0433", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10256,7 +10256,7 @@ }, { "id": "Russia_Chuvashia", - "s": 13243571, + "s": 9138283, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10268,7 +10268,7 @@ }, { "id": "Russia_Ingushetia", - "s": 1367662, + "s": 937065, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10280,7 +10280,7 @@ }, { "id": "Russia_Irkutsk Oblast", - "s": 30685724, + "s": 24379877, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10292,7 +10292,7 @@ }, { "id": "Russia_Ivanovo Oblast", - "s": 14792237, + "s": 11624441, "affiliations": [ "\u0418\u0432\u0430\u043d\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10304,7 +10304,7 @@ }, { "id": "Russia_Jewish Autonomous Oblast", - "s": 4525883, + "s": 4096543, "affiliations": [ "\u0415\u0432\u0440\u0435\u0439\u0441\u043a\u0430\u044f \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10316,7 +10316,7 @@ }, { "id": "Russia_Kabardino-Balkaria", - "s": 5146001, + "s": 3876497, "affiliations": [ "\u041a\u0430\u0431\u0430\u0440\u0434\u0438\u043d\u043e-\u0411\u0430\u043b\u043a\u0430\u0440\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10328,7 +10328,7 @@ }, { "id": "Russia_Kaliningrad Oblast", - "s": 9580923, + "s": 7773733, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10340,7 +10340,7 @@ }, { "id": "Russia_Kaluga Oblast", - "s": 23711628, + "s": 19682467, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10352,7 +10352,7 @@ }, { "id": "Russia_Kamchatka Krai", - "s": 13063055, + "s": 11951778, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10364,7 +10364,7 @@ }, { "id": "Russia_Karachay-Cherkessia", - "s": 11154193, + "s": 10407102, "affiliations": [ "\u041a\u0430\u0440\u0430\u0447\u0430\u0435\u0432\u043e-\u0427\u0435\u0440\u043a\u0435\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10376,7 +10376,7 @@ }, { "id": "Russia_Kemerov Oblast", - "s": 21490294, + "s": 15094430, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10388,7 +10388,7 @@ }, { "id": "Russia_Khabarovsk Krai", - "s": 44688035, + "s": 40525305, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10400,7 +10400,7 @@ }, { "id": "Russia_Khakassia", - "s": 6542297, + "s": 4681398, "affiliations": [ "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u0425\u0430\u043a\u0430\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10412,7 +10412,7 @@ }, { "id": "Russia_Kirov Oblast", - "s": 57787358, + "s": 53095897, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10424,7 +10424,7 @@ }, { "id": "Russia_Komi Republic", - "s": 25632681, + "s": 21530833, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10436,7 +10436,7 @@ }, { "id": "Russia_Kostroma Oblast", - "s": 12205019, + "s": 10709611, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10448,7 +10448,7 @@ }, { "id": "Russia_Krasnodar Krai", - "s": 60856145, + "s": 44405478, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10460,7 +10460,7 @@ }, { "id": "Russia_Krasnodar Krai_Adygeya", - "s": 43985011, + "s": 37035271, "affiliations": [ "\u0410\u0434\u044b\u0433\u0435\u044f", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10473,7 +10473,7 @@ }, { "id": "Russia_Krasnoyarsk Krai_North", - "s": 26230807, + "s": 26006719, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10485,7 +10485,7 @@ }, { "id": "Russia_Krasnoyarsk Krai_South", - "s": 34321443, + "s": 28410378, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10497,7 +10497,7 @@ }, { "id": "Russia_Kurgan Oblast", - "s": 11599853, + "s": 8801543, "affiliations": [ "\u041a\u0443\u0440\u0433\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10509,7 +10509,7 @@ }, { "id": "Russia_Kursk Oblast", - "s": 35188000, + "s": 30343221, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10521,7 +10521,7 @@ }, { "id": "Russia_Leningradskaya Oblast_Karelsky", - "s": 27943302, + "s": 23457310, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10533,7 +10533,7 @@ }, { "id": "Russia_Leningradskaya Oblast_Southeast", - "s": 49955240, + "s": 41751242, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10545,7 +10545,7 @@ }, { "id": "Russia_Lipetsk Oblast", - "s": 25380808, + "s": 19518269, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10557,7 +10557,7 @@ }, { "id": "Russia_Magadan Oblast", - "s": 4254778, + "s": 3776332, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10569,7 +10569,7 @@ }, { "id": "Russia_Mari El", - "s": 16972095, + "s": 14689329, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10581,7 +10581,7 @@ }, { "id": "Russia_Moscow Oblast_East", - "s": 64851818, + "s": 49293398, "affiliations": [ "\u041c\u043e\u0441\u043a\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10593,7 +10593,7 @@ }, { "id": "Russia_Moscow Oblast_West", - "s": 34259441, + "s": 25921341, "affiliations": [ "\u041c\u043e\u0441\u043a\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10606,7 +10606,7 @@ }, { "id": "Russia_Moscow", - "s": 46796554, + "s": 35153413, "affiliations": [ "\u041c\u043e\u0441\u043a\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10619,7 +10619,7 @@ }, { "id": "Russia_Murmansk Oblast", - "s": 35333024, + "s": 33147243, "affiliations": [ "\u041c\u0443\u0440\u043c\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10631,7 +10631,7 @@ }, { "id": "Russia_Nenets Autonomous Okrug", - "s": 13762613, + "s": 13711442, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10643,7 +10643,7 @@ }, { "id": "Russia_Nizhny Novgorod Oblast", - "s": 44666223, + "s": 34489437, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10655,7 +10655,7 @@ }, { "id": "Russia_North Ossetia-Alania", - "s": 4025247, + "s": 2866096, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10667,7 +10667,7 @@ }, { "id": "Russia_Novgorod Oblast", - "s": 15981100, + "s": 13611573, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10679,7 +10679,7 @@ }, { "id": "Russia_Novosibirsk Oblast", - "s": 46248369, + "s": 38613299, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10691,7 +10691,7 @@ }, { "id": "Russia_Omsk Oblast", - "s": 35205742, + "s": 28140456, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10703,7 +10703,7 @@ }, { "id": "Russia_Orenburg Oblast", - "s": 25763004, + "s": 19169324, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10715,7 +10715,7 @@ }, { "id": "Russia_Oryol Oblast", - "s": 6202034, + "s": 5031909, "affiliations": [ "\u041e\u0440\u043b\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10727,7 +10727,7 @@ }, { "id": "Russia_Penza Oblast", - "s": 16266978, + "s": 13529151, "affiliations": [ "\u041f\u0435\u043d\u0437\u0435\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10739,7 +10739,7 @@ }, { "id": "Russia_Perm Krai_North", - "s": 26724578, + "s": 21771556, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10751,7 +10751,7 @@ }, { "id": "Russia_Perm Krai_South", - "s": 38822403, + "s": 31444533, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10763,7 +10763,7 @@ }, { "id": "Russia_Primorsky Krai", - "s": 30632123, + "s": 25540116, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10775,7 +10775,7 @@ }, { "id": "Russia_Pskov Oblast", - "s": 28290224, + "s": 24766695, "affiliations": [ "\u041f\u0441\u043a\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10787,7 +10787,7 @@ }, { "id": "Russia_Republic of Dagestan", - "s": 10304689, + "s": 7713801, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10799,7 +10799,7 @@ }, { "id": "Russia_Republic of Kalmykia", - "s": 3925210, + "s": 3220901, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10812,7 +10812,7 @@ }, { "id": "Russia_Republic of Karelia_North", - "s": 36002532, + "s": 35674351, "affiliations": [ "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041a\u0430\u0440\u0435\u043b\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10824,7 +10824,7 @@ }, { "id": "Russia_Republic of Karelia_South", - "s": 28915245, + "s": 27293754, "affiliations": [ "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041a\u0430\u0440\u0435\u043b\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10836,7 +10836,7 @@ }, { "id": "Russia_Republic of Mordovia", - "s": 13153807, + "s": 11326232, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10848,7 +10848,7 @@ }, { "id": "Russia_Rostov Oblast", - "s": 42963408, + "s": 29407591, "affiliations": [ "\u0420\u043e\u0441\u0442\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10860,7 +10860,7 @@ }, { "id": "Russia_Ryazan Oblast", - "s": 19271159, + "s": 16431874, "affiliations": [ "\u0420\u044f\u0437\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10872,7 +10872,7 @@ }, { "id": "Russia_Saint Petersburg", - "s": 35052782, + "s": 26375760, "affiliations": [ "\u0421\u0430\u043d\u043a\u0442-\u041f\u0435\u0442\u0435\u0440\u0431\u0443\u0440\u0433", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10885,7 +10885,7 @@ }, { "id": "Russia_Sakha Republic", - "s": 53542693, + "s": 51559283, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10897,7 +10897,7 @@ }, { "id": "Russia_Sakhalin Oblast", - "s": 26843516, + "s": 25190229, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10909,7 +10909,7 @@ }, { "id": "Russia_Samara Oblast", - "s": 29671610, + "s": 22402844, "affiliations": [ "\u0421\u0430\u043c\u0430\u0440\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10921,7 +10921,7 @@ }, { "id": "Russia_Saratov Oblast", - "s": 23129016, + "s": 17175460, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10933,7 +10933,7 @@ }, { "id": "Russia_Smolensk Oblast", - "s": 16574377, + "s": 14381980, "affiliations": [ "\u0421\u043c\u043e\u043b\u0435\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10945,7 +10945,7 @@ }, { "id": "Russia_Stavropol Krai", - "s": 23741299, + "s": 18019351, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10957,7 +10957,7 @@ }, { "id": "Russia_Sverdlovsk Oblast_Ekaterinburg", - "s": 36935393, + "s": 29453906, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10969,7 +10969,7 @@ }, { "id": "Russia_Sverdlovsk Oblast_North", - "s": 31532663, + "s": 25560598, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -10981,7 +10981,7 @@ }, { "id": "Russia_Tambov Oblast", - "s": 10880122, + "s": 9074914, "affiliations": [ "\u0422\u0430\u043c\u0431\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -10993,7 +10993,7 @@ }, { "id": "Russia_Tatarstan", - "s": 39079696, + "s": 29734065, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -11005,7 +11005,7 @@ }, { "id": "Russia_Tomsk Oblast", - "s": 17171180, + "s": 14426573, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -11017,7 +11017,7 @@ }, { "id": "Russia_Tula Oblast", - "s": 17400405, + "s": 14430794, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -11029,7 +11029,7 @@ }, { "id": "Russia_Tuva", - "s": 2871780, + "s": 2393610, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -11041,7 +11041,7 @@ }, { "id": "Russia_Tver Oblast", - "s": 35605561, + "s": 30686136, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -11053,7 +11053,7 @@ }, { "id": "Russia_Tyumen Oblast", - "s": 19966410, + "s": 16247789, "affiliations": [ "\u0422\u044e\u043c\u0435\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -11065,7 +11065,7 @@ }, { "id": "Russia_Udmurt Republic", - "s": 23662747, + "s": 19808543, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -11077,7 +11077,7 @@ }, { "id": "Russia_Ulyanovsk Oblast", - "s": 18857155, + "s": 13811183, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -11089,7 +11089,7 @@ }, { "id": "Russia_Vladimir Oblast", - "s": 37958648, + "s": 32713430, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -11101,7 +11101,7 @@ }, { "id": "Russia_Volgograd Oblast", - "s": 34294306, + "s": 24976648, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -11113,7 +11113,7 @@ }, { "id": "Russia_Vologda Oblast", - "s": 29399073, + "s": 25042319, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -11125,7 +11125,7 @@ }, { "id": "Russia_Voronezh Oblast", - "s": 34863266, + "s": 28672162, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -11137,7 +11137,7 @@ }, { "id": "Russia_Yamalo-Nenets Autonomous Okrug", - "s": 19082679, + "s": 17558842, "affiliations": [ "\u042f\u043c\u0430\u043b\u043e-\u041d\u0435\u043d\u0435\u0446\u043a\u0438\u0439 \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u044b\u0439 \u043e\u043a\u0440\u0443\u0433", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -11149,7 +11149,7 @@ }, { "id": "Russia_Yaroslavl Oblast", - "s": 29988493, + "s": 24868500, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -11161,7 +11161,7 @@ }, { "id": "Russia_Yugra_Khanty", - "s": 35951050, + "s": 33211391, "affiliations": [ "\u0425\u0430\u043d\u0442\u044b-\u041c\u0430\u043d\u0441\u0438\u0439\u0441\u043a\u0438\u0439 \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u044b\u0439 \u043e\u043a\u0440\u0443\u0433 - \u042e\u0433\u0440\u0430", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -11173,7 +11173,7 @@ }, { "id": "Russia_Yugra_Surgut", - "s": 33473068, + "s": 28193197, "affiliations": [ "\u0425\u0430\u043d\u0442\u044b-\u041c\u0430\u043d\u0441\u0438\u0439\u0441\u043a\u0438\u0439 \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u044b\u0439 \u043e\u043a\u0440\u0443\u0433 - \u042e\u0433\u0440\u0430", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -11185,7 +11185,7 @@ }, { "id": "Russia_Zabaykalsky Krai", - "s": 19695657, + "s": 16003309, "affiliations": [ "\u0420\u043e\u0441\u0441\u0438\u044f", "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f", @@ -11199,7 +11199,7 @@ }, { "id": "Rwanda", - "s": 7239620, + "s": 4973207, "affiliations": [ "Amajvepfo", "Iburasirasuba", @@ -11214,7 +11214,7 @@ }, { "id": "Sahrawi Arab Democratic Republic", - "s": 339646, + "s": 328396, "affiliations": [ "Dakhla-Oued Ed-Dahab \u2d37\u2d30\u2d45\u2d4d\u2d30-\u2d61\u2d30\u2d37 \u2d37\u2d30\u2d40\u2d30\u2d31 \u0627\u0644\u062f\u0627\u062e\u0644\u0629-\u0648\u0627\u062f\u064a \u0627\u0644\u0630\u0647\u0628", "Maroc \u2d4d\u2d4e\u2d56\u2d54\u2d49\u2d31 \u0627\u0644\u0645\u063a\u0631\u0628", @@ -11226,7 +11226,7 @@ }, { "id": "Saint Helena Ascension and Tristan da Cunha", - "s": 304557, + "s": 262357, "affiliations": [ "Gough Island", "Inaccessible Island", @@ -11240,7 +11240,7 @@ }, { "id": "Samoa", - "s": 2651281, + "s": 2240633, "affiliations": [ "American Samoa", "AS", @@ -11254,7 +11254,7 @@ }, { "id": "San Marino", - "s": 397506, + "s": 282966, "affiliations": [ "Italia", "San Marino" @@ -11269,7 +11269,7 @@ "g": [ { "id": "Saudi Arabia_South", - "s": 40592375, + "s": 15519426, "affiliations": [ "\u0639\u0633\u064a\u0631", "\u062c\u0627\u0632\u0627\u0646", @@ -11284,7 +11284,7 @@ }, { "id": "Saudi Arabia_North", - "s": 36289297, + "s": 15352863, "affiliations": [ "\u0645\u0643\u0629 \u0627\u0644\u0645\u0643\u0631\u0645\u0629", "\u062a\u0628\u0648\u0643", @@ -11304,7 +11304,7 @@ }, { "id": "Senegal", - "s": 51111030, + "s": 22047641, "affiliations": [ "Basse", "Janjanbureh", @@ -11318,7 +11318,7 @@ }, { "id": "Serbia", - "s": 62151605, + "s": 48970101, "affiliations": [ "\u0421\u0440\u0431\u0438\u0458\u0430", "\u0412\u043e\u0458\u0432\u043e\u0434\u0438\u043d\u0430", @@ -11330,7 +11330,7 @@ }, { "id": "Seychelles", - "s": 777978, + "s": 687555, "affiliations": [ "Sesel" ], @@ -11340,7 +11340,7 @@ }, { "id": "Sierra Leone", - "s": 27037380, + "s": 24215209, "affiliations": [ "Eastern Province", "Northern Province", @@ -11354,7 +11354,7 @@ }, { "id": "Singapore", - "s": 11910639, + "s": 9490236, "affiliations": [ "Johor", "Malaysia", @@ -11369,7 +11369,7 @@ "g": [ { "id": "Slovakia_Region of Presov", - "s": 21655998, + "s": 20644149, "affiliations": [ "Pre\u0161ovsk\u00fd kraj", "Slovensko" @@ -11380,7 +11380,7 @@ }, { "id": "Slovakia_Region of Kosice", - "s": 20288530, + "s": 18815252, "affiliations": [ "Ko\u0161ick\u00fd kraj", "Slovensko" @@ -11391,7 +11391,7 @@ }, { "id": "Slovakia_Region of Banska Bystrica", - "s": 23919737, + "s": 23032108, "affiliations": [ "Banskobystrick\u00fd kraj", "Slovensko" @@ -11402,7 +11402,7 @@ }, { "id": "Slovakia_Region of Trnava", - "s": 13781704, + "s": 12558858, "affiliations": [ "Slovensko", "Trnavsk\u00fd kraj" @@ -11413,7 +11413,7 @@ }, { "id": "Slovakia_Region of Trencin", - "s": 17583499, + "s": 16304115, "affiliations": [ "Slovensko", "Tren\u010diansky kraj" @@ -11424,7 +11424,7 @@ }, { "id": "Slovakia_Region of Nitra", - "s": 17368975, + "s": 15564527, "affiliations": [ "Nitriansky kraj", "Slovensko" @@ -11435,7 +11435,7 @@ }, { "id": "Slovakia_Region of Bratislava", - "s": 13724841, + "s": 12108357, "affiliations": [ "Bratislavsk\u00fd kraj", "Slovensko" @@ -11446,7 +11446,7 @@ }, { "id": "Slovakia_Region of Zilina", - "s": 22937515, + "s": 21430173, "affiliations": [ "Slovensko", "\u017dilinsk\u00fd kraj" @@ -11462,7 +11462,7 @@ "g": [ { "id": "Slovenia_East", - "s": 73372252, + "s": 71691813, "affiliations": [ "Border SI-HR", "Slovenija" @@ -11473,7 +11473,7 @@ }, { "id": "Slovenia_West", - "s": 73678157, + "s": 72862427, "affiliations": [ "Slovenija" ], @@ -11485,7 +11485,7 @@ }, { "id": "Solomon Islands", - "s": 1569165, + "s": 1499407, "affiliations": [ "Capital Territory", "Central Province", @@ -11505,7 +11505,7 @@ }, { "id": "Somalia", - "s": 20438980, + "s": 11454651, "affiliations": [ "Awdal", "Bakool", @@ -11536,7 +11536,7 @@ "g": [ { "id": "South Africa_Western Cape", - "s": 31754181, + "s": 18832507, "affiliations": [ "Prince Edward Islands", "South Africa", @@ -11548,7 +11548,7 @@ }, { "id": "South Africa_Gauteng", - "s": 33063471, + "s": 10878935, "affiliations": [ "Gauteng", "South Africa" @@ -11559,7 +11559,7 @@ }, { "id": "South Africa_North West", - "s": 12424896, + "s": 5443762, "affiliations": [ "North West", "South Africa" @@ -11570,7 +11570,7 @@ }, { "id": "South Africa_Free State", - "s": 12937505, + "s": 5806214, "affiliations": [ "Free State", "South Africa" @@ -11581,7 +11581,7 @@ }, { "id": "South Africa_Eastern Cape", - "s": 18173054, + "s": 10124210, "affiliations": [ "Eastern Cape", "South Africa" @@ -11592,7 +11592,7 @@ }, { "id": "South Africa_Northern Cape", - "s": 9887728, + "s": 6603376, "affiliations": [ "Northern Cape", "South Africa" @@ -11603,7 +11603,7 @@ }, { "id": "South Africa_Mpumalanga", - "s": 11573111, + "s": 6081407, "affiliations": [ "Mpumalanga", "South Africa" @@ -11614,7 +11614,7 @@ }, { "id": "South Africa_Limpopo", - "s": 17302220, + "s": 4938670, "affiliations": [ "Limpopo", "South Africa" @@ -11625,7 +11625,7 @@ }, { "id": "South Africa_KwaZulu-Natal", - "s": 24729296, + "s": 15846782, "affiliations": [ "KwaZulu-Natal", "South Africa" @@ -11638,7 +11638,7 @@ }, { "id": "South Georgia and the South Sandwich Islands", - "s": 324163, + "s": 331841, "affiliations": [ "Freezland Rock", "South Georgia and South Sandwich Islands" @@ -11649,7 +11649,7 @@ }, { "id": "South Ossetia", - "s": 1691945, + "s": 1326394, "affiliations": [ "\u0425\u0443\u0441\u0441\u0430\u0440 \u0418\u0440\u044b\u0441\u0442\u043e\u043d", "\u0425\u0443\u0441\u0441\u0430\u0440 \u0418\u0440\u044b\u0441\u0442\u043e\u043d - \u042e\u0436\u043d\u0430\u044f \u041e\u0441\u0435\u0442\u0438\u044f", @@ -11661,7 +11661,7 @@ }, { "id": "South Sudan", - "s": 39540462, + "s": 35128226, "affiliations": [ "\u0627\u0644\u0633\u0648\u062f\u0627\u0646 - Sudan", "Central Equatoria", @@ -11685,7 +11685,7 @@ "g": [ { "id": "Spain_Andalusia_Granada", - "s": 40734723, + "s": 28343037, "affiliations": [ "Andaluc\u00eda", "Espa\u00f1a (mare territorial)", @@ -11697,7 +11697,7 @@ }, { "id": "Spain_Andalusia_Sevilla", - "s": 53869088, + "s": 36475046, "affiliations": [ "Andaluc\u00eda", "Espa\u00f1a" @@ -11708,7 +11708,7 @@ }, { "id": "Spain_Aragon", - "s": 36958056, + "s": 33486803, "affiliations": [ "Arag\u00f3n", "Espa\u00f1a" @@ -11719,7 +11719,7 @@ }, { "id": "Spain_Balearic Islands", - "s": 20763157, + "s": 16461749, "affiliations": [ "Illes Balears", "Espa\u00f1a" @@ -11730,7 +11730,7 @@ }, { "id": "Spain_Basque Country", - "s": 34254288, + "s": 29836319, "affiliations": [ "Castilla y Le\u00f3n", "Espa\u00f1a", @@ -11742,7 +11742,7 @@ }, { "id": "Spain_Canary Islands", - "s": 33445551, + "s": 28518870, "affiliations": [ "Canarias", "Espa\u00f1a" @@ -11753,7 +11753,7 @@ }, { "id": "Spain_Cantabria", - "s": 15881228, + "s": 12857926, "affiliations": [ "Cantabria", "Espa\u00f1a" @@ -11764,7 +11764,7 @@ }, { "id": "Spain_Castile and Leon_West", - "s": 53647130, + "s": 39871637, "affiliations": [ "Castilla y Le\u00f3n", "Espa\u00f1a" @@ -11775,7 +11775,7 @@ }, { "id": "Spain_Castile and Leon_East", - "s": 39131820, + "s": 31465704, "affiliations": [ "Castilla y Le\u00f3n", "Espa\u00f1a" @@ -11786,7 +11786,7 @@ }, { "id": "Spain_Castile-La Mancha", - "s": 56211254, + "s": 41955617, "affiliations": [ "Castilla-La Mancha", "Espa\u00f1a" @@ -11797,7 +11797,7 @@ }, { "id": "Spain_Catalonia_Provincia de Barcelona", - "s": 45308588, + "s": 37244601, "affiliations": [ "Catalunya", "Espa\u00f1a" @@ -11808,7 +11808,7 @@ }, { "id": "Spain_Catalonia_Provincia de Girona", - "s": 22000722, + "s": 18521865, "affiliations": [ "Catalunya", "Espa\u00f1a" @@ -11819,7 +11819,7 @@ }, { "id": "Spain_Catalonia_Provincia de Lleida", - "s": 22740819, + "s": 20984670, "affiliations": [ "Catalunya", "Espa\u00f1a" @@ -11830,7 +11830,7 @@ }, { "id": "Spain_Catalonia_Provincia de Tarragona", - "s": 16012123, + "s": 12406127, "affiliations": [ "Catalunya", "Espa\u00f1a" @@ -11841,7 +11841,7 @@ }, { "id": "Spain_Ceuta", - "s": 303237, + "s": 235629, "affiliations": [ "Ceuta", "Espa\u00f1a", @@ -11853,7 +11853,7 @@ }, { "id": "Spain_Community of Madrid", - "s": 46685443, + "s": 37136371, "affiliations": [ "Comunidad de Madrid", "Espa\u00f1a" @@ -11864,7 +11864,7 @@ }, { "id": "Spain_Comunidad Foral de Navarra", - "s": 14787163, + "s": 12622305, "affiliations": [ "Comunidad Foral de Navarra", "Espa\u00f1a" @@ -11875,7 +11875,7 @@ }, { "id": "Spain_Extremadura", - "s": 23773218, + "s": 17046035, "affiliations": [ "Espa\u00f1a", "Extremadura" @@ -11886,7 +11886,7 @@ }, { "id": "Spain_Galicia_North", - "s": 39130818, + "s": 27954065, "affiliations": [ "Espa\u00f1a", "Galicia" @@ -11897,7 +11897,7 @@ }, { "id": "Spain_Galicia_South", - "s": 31258704, + "s": 19844770, "affiliations": [ "Espa\u00f1a", "Galicia" @@ -11908,7 +11908,7 @@ }, { "id": "Spain_La Rioja", - "s": 5652493, + "s": 4622404, "affiliations": [ "Espa\u00f1a", "La Rioja" @@ -11919,7 +11919,7 @@ }, { "id": "Spain_Melilla", - "s": 688255, + "s": 484837, "affiliations": [ "Espa\u00f1a", "Maroc \u2d4d\u2d4e\u2d56\u2d54\u2d49\u2d31 \u0627\u0644\u0645\u063a\u0631\u0628", @@ -11932,7 +11932,7 @@ }, { "id": "Spain_Principado de Asturias", - "s": 21040952, + "s": 16827668, "affiliations": [ "Espa\u00f1a", "Principado de Asturias" @@ -11943,7 +11943,7 @@ }, { "id": "Spain_Region de Murcia", - "s": 19331662, + "s": 11816543, "affiliations": [ "Espa\u00f1a", "Regi\u00f3n de Murcia" @@ -11954,7 +11954,7 @@ }, { "id": "Spain_Valencian Community", - "s": 62928869, + "s": 43753040, "affiliations": [ "Comunitat Valenciana", "Espa\u00f1a" @@ -11970,7 +11970,7 @@ "g": [ { "id": "Jerusalem", - "s": 4390238, + "s": 3671013, "affiliations": [ "\u05de\u05d7\u05d5\u05d6 \u05d9\u05e8\u05d5\u05e9\u05dc\u05d9\u05dd", "\u05de\u05d3\u05d9\u05e0\u05ea \u05d9\u05e9\u05e8\u05d0\u05dc" @@ -11982,7 +11982,7 @@ }, { "id": "Palestine", - "s": 21085453, + "s": 13788994, "affiliations": [ "Area A", "Area B", @@ -11996,7 +11996,7 @@ }, { "id": "Sri Lanka", - "s": 57101470, + "s": 40755455, "affiliations": [ "Central Province", "Eastern Province", @@ -12018,7 +12018,7 @@ "g": [ { "id": "Sudan_East", - "s": 18066144, + "s": 4520638, "affiliations": [ "Al Ba\u1e29r al A\u1e29mar", "\u0627\u0644\u0633\u0648\u062f\u0627\u0646 - Sudan", @@ -12038,7 +12038,7 @@ }, { "id": "Sudan_West", - "s": 68365785, + "s": 13094329, "affiliations": [ "\u0627\u0644\u0633\u0648\u062f\u0627\u0646 - Sudan", "Gharb Darfur", @@ -12065,7 +12065,7 @@ }, { "id": "Suriname", - "s": 5365579, + "s": 3934288, "affiliations": [ "Brokopondo", "Commewijne", @@ -12085,7 +12085,7 @@ }, { "id": "Swaziland", - "s": 17787749, + "s": 16521982, "affiliations": [ "Sifundza seHhohho", "Sifundza seLubombo", @@ -12102,7 +12102,7 @@ "g": [ { "id": "Sweden_Malardalen", - "s": 29651976, + "s": 24942891, "affiliations": [ "S\u00f6dermanlands l\u00e4n", "Sverige", @@ -12115,7 +12115,7 @@ }, { "id": "Sweden_Stockholm", - "s": 43897972, + "s": 37284673, "affiliations": [ "Stockholms l\u00e4n", "Sverige" @@ -12126,7 +12126,7 @@ }, { "id": "Sweden_Ostra Gotaland", - "s": 56195844, + "s": 46099744, "affiliations": [ "Gotlands l\u00e4n", "J\u00f6nk\u00f6pings l\u00e4n", @@ -12143,7 +12143,7 @@ }, { "id": "Sweden_Norra Sverige", - "s": 34253030, + "s": 30423648, "affiliations": [ "Norrbottens l\u00e4n", "Sverige", @@ -12155,7 +12155,7 @@ }, { "id": "Sweden_Mellannorrland", - "s": 26263357, + "s": 22510777, "affiliations": [ "J\u00e4mtlands l\u00e4n", "Sverige", @@ -12167,7 +12167,7 @@ }, { "id": "Sweden_Bergslagen", - "s": 58435889, + "s": 49938497, "affiliations": [ "Dalarnas l\u00e4n", "G\u00e4vleborgs l\u00e4n", @@ -12181,7 +12181,7 @@ }, { "id": "Sweden_Vastra Gotaland", - "s": 68613471, + "s": 55486104, "affiliations": [ "Danmark", "Hallands l\u00e4n", @@ -12194,7 +12194,7 @@ }, { "id": "Sweden_Sodra Gotaland", - "s": 45140635, + "s": 34969144, "affiliations": [ "Blekinge l\u00e4n", "Danmark", @@ -12213,7 +12213,7 @@ "g": [ { "id": "Switzerland_Eastern", - "s": 44229027, + "s": 38009351, "affiliations": [ "Appenzell Ausserrhoden", "Appenzell Innerrhoden", @@ -12230,7 +12230,7 @@ }, { "id": "Switzerland_Central", - "s": 21428446, + "s": 18664732, "affiliations": [ "Luzern", "Nidwalden", @@ -12246,7 +12246,7 @@ }, { "id": "Switzerland_Espace Mittelland_Bern", - "s": 46189641, + "s": 38857654, "affiliations": [ "Basel-Landschaft", "Bern - Berne", @@ -12263,7 +12263,7 @@ }, { "id": "Switzerland_Espace Mittelland_East", - "s": 20945480, + "s": 18903220, "affiliations": [ "Bern - Berne", "Schweiz, Suisse, Svizzera, Svizra" @@ -12274,7 +12274,7 @@ }, { "id": "Switzerland_Ticino", - "s": 10542270, + "s": 8795444, "affiliations": [ "Schweiz, Suisse, Svizzera, Svizra", "Ticino" @@ -12285,7 +12285,7 @@ }, { "id": "Switzerland_Northwestern", - "s": 30543950, + "s": 26211826, "affiliations": [ "Aargau", "Basel-Landschaft", @@ -12298,7 +12298,7 @@ }, { "id": "Switzerland_Lake Geneva region", - "s": 52354151, + "s": 44221503, "affiliations": [ "Fribourg - Freiburg", "Gen\u00e8ve", @@ -12312,7 +12312,7 @@ }, { "id": "Switzerland_Zurich", - "s": 31080356, + "s": 27037537, "affiliations": [ "Schweiz, Suisse, Svizzera, Svizra", "Z\u00fcrich" @@ -12325,7 +12325,7 @@ }, { "id": "Syria", - "s": 52807542, + "s": 23568139, "affiliations": [ "Al-Hasakah", "Aleppo", @@ -12349,7 +12349,7 @@ }, { "id": "Sao Tome and Principe", - "s": 529355, + "s": 430585, "affiliations": [ "Pr\u00edncipe Province", "S\u00e3o Tom\u00e9 Province", @@ -12361,7 +12361,7 @@ }, { "id": "Tajikistan", - "s": 13997297, + "s": 11786294, "affiliations": [ "\u0412\u0438\u043b\u043e\u044f\u0442\u0438 \u0421\u0443\u0493\u0434", "\u0412\u0438\u043b\u043e\u044f\u0442\u0438 \u0425\u0430\u0442\u043b\u043e\u043d", @@ -12375,7 +12375,7 @@ }, { "id": "Tanzania", - "s": 122903491, + "s": 93085321, "affiliations": [ "Arusha", "Dar es Salaam", @@ -12413,7 +12413,7 @@ "g": [ { "id": "Thailand_North", - "s": 32401245, + "s": 20930717, "affiliations": [ "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1e\u0e30\u0e40\u0e22\u0e32", "\u0e1b\u0e23\u0e30\u0e40\u0e17\u0e28\u0e44\u0e17\u0e22", @@ -12436,7 +12436,7 @@ }, { "id": "Thailand_Central", - "s": 62008034, + "s": 29275209, "affiliations": [ "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2d\u0e48\u0e32\u0e07\u0e17\u0e2d\u0e07", "\u0e1b\u0e23\u0e30\u0e40\u0e17\u0e28\u0e44\u0e17\u0e22", @@ -12482,7 +12482,7 @@ }, { "id": "Thailand_South", - "s": 62092280, + "s": 36300131, "affiliations": [ "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e0a\u0e38\u0e21\u0e1e\u0e23", "\u0e1b\u0e23\u0e30\u0e40\u0e17\u0e28\u0e44\u0e17\u0e22", @@ -12526,7 +12526,7 @@ }, { "id": "The Bahamas", - "s": 7053906, + "s": 5185772, "affiliations": [ "Ciego de \u00c1vila", "The Bahamas" @@ -12537,7 +12537,7 @@ }, { "id": "The Gambia", - "s": 6355395, + "s": 3469796, "affiliations": [ "Brikama", "Banjul", @@ -12559,7 +12559,7 @@ "g": [ { "id": "Netherlands_Drenthe", - "s": 40985896, + "s": 37537194, "affiliations": [ "Drenthe", "Nederland" @@ -12570,7 +12570,7 @@ }, { "id": "Netherlands_Flevoland", - "s": 24044400, + "s": 22221248, "affiliations": [ "Flevoland", "Nederland" @@ -12581,7 +12581,7 @@ }, { "id": "Netherlands_Friesland", - "s": 54350188, + "s": 51327737, "affiliations": [ "Friesland", "Nederland" @@ -12592,7 +12592,7 @@ }, { "id": "Netherlands_Gelderland_Nijmegen", - "s": 40219998, + "s": 37405883, "affiliations": [ "Gelderland", "Nederland" @@ -12603,7 +12603,7 @@ }, { "id": "Netherlands_Gelderland_North", - "s": 64105288, + "s": 59999928, "affiliations": [ "Gelderland", "Nederland" @@ -12614,7 +12614,7 @@ }, { "id": "Netherlands_Gelderland_Zutphen", - "s": 27960043, + "s": 25742025, "affiliations": [ "Gelderland", "Nederland" @@ -12625,7 +12625,7 @@ }, { "id": "Netherlands_Groningen", - "s": 40854382, + "s": 37357322, "affiliations": [ "Deutschland", "Groningen", @@ -12638,7 +12638,7 @@ }, { "id": "Netherlands_Limburg", - "s": 72197904, + "s": 66873048, "affiliations": [ "Limburg", "Nederland" @@ -12649,7 +12649,7 @@ }, { "id": "Netherlands_North Brabant_Eindhoven", - "s": 62570577, + "s": 57868537, "affiliations": [ "Nederland", "Noord-Brabant" @@ -12660,7 +12660,7 @@ }, { "id": "Netherlands_North Brabant_Roosendaal", - "s": 21601490, + "s": 19986425, "affiliations": [ "Nederland", "Noord-Brabant" @@ -12671,7 +12671,7 @@ }, { "id": "Netherlands_North Brabant_Tiburg", - "s": 47523301, + "s": 43981720, "affiliations": [ "Nederland", "Nederland - Belgique / Belgi\u00eb / Belgien", @@ -12683,7 +12683,7 @@ }, { "id": "Netherlands_North Brabant_Uden", - "s": 22071061, + "s": 20328135, "affiliations": [ "Nederland", "Noord-Brabant" @@ -12694,7 +12694,7 @@ }, { "id": "Netherlands_North Holland_Alkmaar", - "s": 35987049, + "s": 34301408, "affiliations": [ "Nederland", "Noord-Holland" @@ -12705,7 +12705,7 @@ }, { "id": "Netherlands_North Holland_Amsterdam", - "s": 79206259, + "s": 74967502, "affiliations": [ "Nederland", "Noord-Holland" @@ -12716,7 +12716,7 @@ }, { "id": "Netherlands_North Holland_Zaandam", - "s": 27937482, + "s": 26317073, "affiliations": [ "Nederland", "Noord-Holland" @@ -12727,7 +12727,7 @@ }, { "id": "Netherlands_Overijssel_Enschede", - "s": 42370541, + "s": 39306467, "affiliations": [ "Nederland", "Overijssel" @@ -12738,7 +12738,7 @@ }, { "id": "Netherlands_Overijssel_Zwolle", - "s": 37174305, + "s": 34570036, "affiliations": [ "Nederland", "Overijssel" @@ -12749,7 +12749,7 @@ }, { "id": "Netherlands_South Holland_Brielle", - "s": 20488316, + "s": 18734278, "affiliations": [ "Nederland", "Zuid-Holland" @@ -12760,7 +12760,7 @@ }, { "id": "Netherlands_South Holland_Den Haag", - "s": 62668598, + "s": 58966781, "affiliations": [ "Nederland", "Zuid-Holland" @@ -12771,7 +12771,7 @@ }, { "id": "Netherlands_South Holland_Leiden", - "s": 26020319, + "s": 24821909, "affiliations": [ "Nederland", "Zuid-Holland" @@ -12782,7 +12782,7 @@ }, { "id": "Netherlands_South Holland_Rotterdam", - "s": 65389482, + "s": 61456751, "affiliations": [ "Nederland", "Zuid-Holland" @@ -12793,7 +12793,7 @@ }, { "id": "Netherlands_Utrecht_Amersfoort", - "s": 30568825, + "s": 28637284, "affiliations": [ "Utrecht", "Nederland" @@ -12804,7 +12804,7 @@ }, { "id": "Netherlands_Utrecht_Utrecht", - "s": 36010837, + "s": 33836266, "affiliations": [ "Utrecht", "Nederland" @@ -12815,7 +12815,7 @@ }, { "id": "Netherlands_Zeeland", - "s": 33563918, + "s": 30570899, "affiliations": [ "Nederland", "Zeeland" @@ -12828,7 +12828,7 @@ }, { "id": "Togo", - "s": 25937829, + "s": 18362796, "affiliations": [ "R\u00e9gion Centrale", "R\u00e9gion Maritime", @@ -12843,7 +12843,7 @@ }, { "id": "Tonga", - "s": 2991389, + "s": 2558965, "affiliations": [ "Ha\u02bbapai", "Ongo Niua", @@ -12863,7 +12863,7 @@ }, { "id": "Tunisia", - "s": 44475088, + "s": 20841859, "affiliations": [ "Tunisie \u2d5c\u2d53\u2d4f\u2d59 \u062a\u0648\u0646\u0633", "\u0628\u0627\u062c\u0629", @@ -12900,7 +12900,7 @@ "g": [ { "id": "Turkey_Mediterranean Region", - "s": 42966301, + "s": 19961846, "affiliations": [ "Adana", "Antalya", @@ -12918,7 +12918,7 @@ }, { "id": "Turkey_Southeastern Anatolia Region", - "s": 25838730, + "s": 11685370, "affiliations": [ "Ad\u0131yaman", "Batman", @@ -12938,7 +12938,7 @@ }, { "id": "Turkey_Marmara Region_Istanbul", - "s": 52743163, + "s": 18186089, "affiliations": [ "Edirne", "Kocaeli", @@ -12955,7 +12955,7 @@ }, { "id": "Turkey_Marmara Region_Bursa", - "s": 37714149, + "s": 15026054, "affiliations": [ "Bal\u0131kesir", "Bilecik", @@ -12975,7 +12975,7 @@ }, { "id": "Turkey_Eastern Anatolia Region", - "s": 27259069, + "s": 17725286, "affiliations": [ "Ardahan", "A\u011fr\u0131", @@ -12999,7 +12999,7 @@ }, { "id": "Turkey_Black Sea Region", - "s": 38362580, + "s": 26064263, "affiliations": [ "Amasya", "Bolu", @@ -13027,7 +13027,7 @@ }, { "id": "Turkey_Central Anatolia Region_Ankara", - "s": 45864742, + "s": 19864807, "affiliations": [ "Aksaray", "Ankara", @@ -13045,7 +13045,7 @@ }, { "id": "Turkey_Central Anatolia Region_Kayseri", - "s": 19433370, + "s": 10097123, "affiliations": [ "Kayseri", "K\u0131r\u015fehir", @@ -13061,7 +13061,7 @@ }, { "id": "Turkey_Aegean Region", - "s": 49760547, + "s": 20063735, "affiliations": [ "Afyonkarahisar", "Ayd\u0131n", @@ -13081,7 +13081,7 @@ }, { "id": "Turkmenistan", - "s": 9920185, + "s": 6025121, "affiliations": [ "Ahal", "Balkan", @@ -13096,7 +13096,7 @@ }, { "id": "Turks and Caicos Islands", - "s": 694243, + "s": 449061, "affiliations": [ "Rep\u00fablica Dominicana", "The Bahamas", @@ -13108,7 +13108,7 @@ }, { "id": "Tuvalu", - "s": 278745, + "s": 263363, "affiliations": [ "Tuvalu" ], @@ -13118,7 +13118,7 @@ }, { "id": "Uganda", - "s": 35865393, + "s": 29182679, "affiliations": [ "Abim", "Agago", @@ -13170,7 +13170,7 @@ "g": [ { "id": "Ukraine_Cherkasy Oblast", - "s": 14427294, + "s": 11437969, "affiliations": [ "\u0427\u0435\u0440\u043a\u0430\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" @@ -13181,7 +13181,7 @@ }, { "id": "Ukraine_Chernihiv Oblast", - "s": 15257910, + "s": 12790831, "affiliations": [ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0427\u0435\u0440\u043d\u0456\u0433\u0456\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" @@ -13192,7 +13192,7 @@ }, { "id": "Ukraine_Chernivtsi Oblast", - "s": 14290003, + "s": 12037642, "affiliations": [ "\u0427\u0435\u0440\u043d\u0456\u0432\u0435\u0446\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" @@ -13203,7 +13203,7 @@ }, { "id": "Ukraine_Dnipropetrovsk Oblast", - "s": 37064809, + "s": 27384841, "affiliations": [ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0414\u043d\u0456\u043f\u0440\u043e\u043f\u0435\u0442\u0440\u043e\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" @@ -13214,7 +13214,7 @@ }, { "id": "Ukraine_Donetsk Oblast", - "s": 41572930, + "s": 29226721, "affiliations": [ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0414\u043e\u043d\u0435\u0446\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" @@ -13225,7 +13225,7 @@ }, { "id": "Ukraine_Ivano-Frankivsk Oblast", - "s": 16863867, + "s": 14780069, "affiliations": [ "\u0406\u0432\u0430\u043d\u043e-\u0424\u0440\u0430\u043d\u043a\u0456\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" @@ -13236,7 +13236,7 @@ }, { "id": "Ukraine_Kharkiv Oblast", - "s": 27767645, + "s": 22224405, "affiliations": [ "\u0425\u0430\u0440\u043a\u0456\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" @@ -13247,7 +13247,7 @@ }, { "id": "Ukraine_Kherson Oblast", - "s": 10758061, + "s": 7649453, "affiliations": [ "\u0425\u0435\u0440\u0441\u043e\u043d\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" @@ -13258,7 +13258,7 @@ }, { "id": "Ukraine_Khmelnytskyi Oblast", - "s": 13199651, + "s": 10280418, "affiliations": [ "\u0425\u043c\u0435\u043b\u044c\u043d\u0438\u0446\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" @@ -13269,7 +13269,7 @@ }, { "id": "Ukraine_Kirovohrad Oblast", - "s": 14085942, + "s": 10964494, "affiliations": [ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u041a\u0456\u0440\u043e\u0432\u043e\u0433\u0440\u0430\u0434\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" @@ -13280,7 +13280,7 @@ }, { "id": "Ukraine_Kyiv Oblast", - "s": 38219038, + "s": 30170643, "affiliations": [ "\u041a\u0438\u0457\u0432", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", @@ -13292,7 +13292,7 @@ }, { "id": "Ukraine_Luhansk Oblast", - "s": 28121655, + "s": 24343420, "affiliations": [ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u041b\u0443\u0433\u0430\u043d\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" @@ -13303,7 +13303,7 @@ }, { "id": "Ukraine_Lviv Oblast", - "s": 28318515, + "s": 22813530, "affiliations": [ "\u041b\u044c\u0432\u0456\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" @@ -13314,7 +13314,7 @@ }, { "id": "Ukraine_Mykolaiv Oblast", - "s": 13270404, + "s": 9918031, "affiliations": [ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u041c\u0438\u043a\u043e\u043b\u0430\u0457\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" @@ -13325,7 +13325,7 @@ }, { "id": "Ukraine_Odessa Oblast", - "s": 24248264, + "s": 17057546, "affiliations": [ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u041e\u0434\u0435\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" @@ -13336,7 +13336,7 @@ }, { "id": "Ukraine_Poltava Oblast", - "s": 17056612, + "s": 12542980, "affiliations": [ "\u041f\u043e\u043b\u0442\u0430\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" @@ -13347,7 +13347,7 @@ }, { "id": "Ukraine_Rivne Oblast", - "s": 9069062, + "s": 7278150, "affiliations": [ "\u0420\u0456\u0432\u043d\u0435\u043d\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" @@ -13358,7 +13358,7 @@ }, { "id": "Ukraine_Sumy Oblast", - "s": 17323584, + "s": 14568981, "affiliations": [ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0421\u0443\u043c\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" @@ -13369,7 +13369,7 @@ }, { "id": "Ukraine_Ternopil Oblast", - "s": 16171381, + "s": 13842388, "affiliations": [ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0422\u0435\u0440\u043d\u043e\u043f\u0456\u043b\u044c\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" @@ -13380,7 +13380,7 @@ }, { "id": "Ukraine_Vinnytsia Oblast", - "s": 16814307, + "s": 12216567, "affiliations": [ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0412\u0456\u043d\u043d\u0438\u0446\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" @@ -13391,7 +13391,7 @@ }, { "id": "Ukraine_Volyn Oblast", - "s": 12606265, + "s": 10301605, "affiliations": [ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0412\u043e\u043b\u0438\u043d\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" @@ -13402,7 +13402,7 @@ }, { "id": "Ukraine_Zakarpattia Oblast", - "s": 14481763, + "s": 13231286, "affiliations": [ "\u0423\u043a\u0440\u0430\u0457\u043d\u0430", "\u0417\u0430\u043a\u0430\u0440\u043f\u0430\u0442\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c" @@ -13413,7 +13413,7 @@ }, { "id": "Ukraine_Zaporizhia Oblast", - "s": 12733715, + "s": 9620872, "affiliations": [ "\u0417\u0430\u043f\u043e\u0440\u0456\u0437\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" @@ -13424,7 +13424,7 @@ }, { "id": "Ukraine_Zhytomyr Oblast", - "s": 10602976, + "s": 7933882, "affiliations": [ "\u0416\u0438\u0442\u043e\u043c\u0438\u0440\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c", "\u0423\u043a\u0440\u0430\u0457\u043d\u0430" @@ -13435,7 +13435,7 @@ }, { "id": "Crimea", - "s": 29694146, + "s": 22391181, "affiliations": [ "\u0410\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u0430 \u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0456\u043a\u0430 \u041a\u0440\u0438\u043c", "\u0420\u043e\u0441\u0441\u0438\u044f", @@ -13452,7 +13452,7 @@ }, { "id": "United Arab Emirates", - "s": 31537945, + "s": 17269517, "affiliations": [ "\u0623\u0628\u0648 \u0638\u0628\u064a", "\u200f\u0623\u0645 \u0627\u0644\u0642\u064a\u0648\u064a\u0646\u200e", @@ -13470,7 +13470,7 @@ }, { "id": "Falkland Islands", - "s": 2133007, + "s": 2140602, "affiliations": [ "Falkland Islands" ], @@ -13483,7 +13483,7 @@ "g": [ { "id": "British Indian Ocean Territory", - "s": 126911, + "s": 105120, "affiliations": [ "British Indian Ocean Territory" ], @@ -13493,7 +13493,7 @@ }, { "id": "UK_England_East Midlands", - "s": 77661354, + "s": 59743548, "affiliations": [ "England", "United Kingdom" @@ -13504,7 +13504,7 @@ }, { "id": "UK_England_East of England_Essex", - "s": 45255090, + "s": 34551008, "affiliations": [ "England", "United Kingdom" @@ -13515,7 +13515,7 @@ }, { "id": "UK_England_East of England_Norfolk", - "s": 55287840, + "s": 43777959, "affiliations": [ "England", "United Kingdom" @@ -13526,7 +13526,7 @@ }, { "id": "UK_England_Greater London", - "s": 51696381, + "s": 37361232, "affiliations": [ "England", "United Kingdom" @@ -13537,7 +13537,7 @@ }, { "id": "UK_England_North East England", - "s": 37814111, + "s": 26552336, "affiliations": [ "England", "United Kingdom" @@ -13548,7 +13548,7 @@ }, { "id": "UK_England_North West England_Manchester", - "s": 65466053, + "s": 42953894, "affiliations": [ "England", "United Kingdom" @@ -13559,7 +13559,7 @@ }, { "id": "UK_England_North West England_Lancaster", - "s": 21811606, + "s": 16568587, "affiliations": [ "England", "United Kingdom" @@ -13570,7 +13570,7 @@ }, { "id": "UK_England_South East_Brighton", - "s": 56682696, + "s": 41471011, "affiliations": [ "England", "United Kingdom" @@ -13581,7 +13581,7 @@ }, { "id": "UK_England_South East_Oxford", - "s": 62202209, + "s": 46768682, "affiliations": [ "England", "United Kingdom" @@ -13592,7 +13592,7 @@ }, { "id": "UK_England_South West England_Bristol", - "s": 64922147, + "s": 48772748, "affiliations": [ "England", "United Kingdom" @@ -13603,7 +13603,7 @@ }, { "id": "UK_England_South West England_Cornwall", - "s": 35147594, + "s": 25988070, "affiliations": [ "England", "United Kingdom" @@ -13614,7 +13614,7 @@ }, { "id": "UK_England_West Midlands", - "s": 90192298, + "s": 70162601, "affiliations": [ "England", "United Kingdom" @@ -13625,7 +13625,7 @@ }, { "id": "UK_England_Yorkshire and the Humber", - "s": 86877175, + "s": 65595606, "affiliations": [ "England", "United Kingdom" @@ -13636,7 +13636,7 @@ }, { "id": "UK_Northern Ireland", - "s": 21636417, + "s": 13748617, "affiliations": [ "Northern Ireland", "Scotland", @@ -13648,7 +13648,7 @@ }, { "id": "UK_Scotland_North", - "s": 64899322, + "s": 53765582, "affiliations": [ "Scotland", "United Kingdom" @@ -13659,7 +13659,7 @@ }, { "id": "UK_Scotland_South", - "s": 63802033, + "s": 49902844, "affiliations": [ "Isle of Man", "Scotland", @@ -13671,7 +13671,7 @@ }, { "id": "UK_Wales", - "s": 61146470, + "s": 45819740, "affiliations": [ "United Kingdom", "Wales" @@ -13687,7 +13687,7 @@ "g": [ { "id": "Ireland_Connacht", - "s": 23725795, + "s": 18846755, "affiliations": [ "Ireland" ], @@ -13697,7 +13697,7 @@ }, { "id": "Ireland_Leinster", - "s": 43696135, + "s": 31804891, "affiliations": [ "Ireland" ], @@ -13707,7 +13707,7 @@ }, { "id": "Ireland_Munster", - "s": 31146989, + "s": 22038319, "affiliations": [ "Ireland" ], @@ -13717,7 +13717,7 @@ }, { "id": "Ireland_Northern Counties", - "s": 9784655, + "s": 7205395, "affiliations": [ "Ireland" ], @@ -13735,7 +13735,7 @@ "g": [ { "id": "US_Alabama_Birmingham", - "s": 49394781, + "s": 23617631, "affiliations": [ "Alabama", "AL", @@ -13747,7 +13747,7 @@ }, { "id": "US_Alabama_Montgomery", - "s": 56936219, + "s": 28585468, "affiliations": [ "Alabama", "AL", @@ -13761,7 +13761,7 @@ }, { "id": "US_Alaska", - "s": 47026030, + "s": 42184107, "affiliations": [ "Alaska", "AK", @@ -13776,7 +13776,7 @@ "g": [ { "id": "US_Arizona_Flagstaff", - "s": 35838098, + "s": 27322587, "affiliations": [ "Arizona", "AZ", @@ -13788,7 +13788,7 @@ }, { "id": "US_Arizona_Phoenix", - "s": 67676586, + "s": 33482235, "affiliations": [ "Arizona", "AZ", @@ -13800,7 +13800,7 @@ }, { "id": "US_Arizona_Tucson", - "s": 25693425, + "s": 15493690, "affiliations": [ "Arizona", "AZ", @@ -13817,7 +13817,7 @@ "g": [ { "id": "US_Arkansas_North", - "s": 48664973, + "s": 29059879, "affiliations": [ "Arkansas", "AR", @@ -13829,7 +13829,7 @@ }, { "id": "US_Arkansas_South", - "s": 31128092, + "s": 14105846, "affiliations": [ "Arkansas", "AR", @@ -13846,7 +13846,7 @@ "g": [ { "id": "US_California_Chico", - "s": 36323400, + "s": 29163033, "affiliations": [ "California", "CA", @@ -13858,7 +13858,7 @@ }, { "id": "US_California_Bakersfield_Bakersfield", - "s": 38519516, + "s": 29557078, "affiliations": [ "California", "CA", @@ -13870,7 +13870,7 @@ }, { "id": "US_California_Bakersfield_Lancaster", - "s": 31824383, + "s": 23966248, "affiliations": [ "California", "CA", @@ -13882,7 +13882,7 @@ }, { "id": "US_California_LA", - "s": 212733258, + "s": 162173054, "affiliations": [ "California", "CA", @@ -13894,7 +13894,7 @@ }, { "id": "US_California_LA North", - "s": 59488524, + "s": 49423262, "affiliations": [ "California", "CA", @@ -13906,7 +13906,7 @@ }, { "id": "US_California_Redding", - "s": 43564156, + "s": 36819815, "affiliations": [ "California", "CA", @@ -13919,7 +13919,7 @@ }, { "id": "US_California_Sacramento_Sacramento", - "s": 30348254, + "s": 18579692, "affiliations": [ "California", "CA", @@ -13931,7 +13931,7 @@ }, { "id": "US_California_Sacramento_Fresno", - "s": 33103201, + "s": 23781728, "affiliations": [ "California", "CA", @@ -13943,7 +13943,7 @@ }, { "id": "US_California_Sacramento_Stockton", - "s": 38914573, + "s": 28673085, "affiliations": [ "California", "CA", @@ -13955,7 +13955,7 @@ }, { "id": "US_California_San Diego", - "s": 68990320, + "s": 48685738, "affiliations": [ "California", "CA", @@ -13967,7 +13967,7 @@ }, { "id": "US_California_Santa_Clara_Santa Cruz", - "s": 19239433, + "s": 15044899, "affiliations": [ "California", "CA", @@ -13979,7 +13979,7 @@ }, { "id": "US_California_Santa_Clara_Palo Alto", - "s": 97262275, + "s": 68681504, "affiliations": [ "California", "CA", @@ -13996,7 +13996,7 @@ "g": [ { "id": "US_Colorado_Aspen", - "s": 42645422, + "s": 35938330, "affiliations": [ "Colorado", "CO", @@ -14008,7 +14008,7 @@ }, { "id": "US_Colorado_Denver", - "s": 80710896, + "s": 44040598, "affiliations": [ "Colorado", "CO", @@ -14020,7 +14020,7 @@ }, { "id": "US_Colorado_South", - "s": 40367194, + "s": 31150761, "affiliations": [ "Colorado", "CO", @@ -14034,7 +14034,7 @@ }, { "id": "US_Connecticut", - "s": 35448026, + "s": 19247671, "affiliations": [ "Connecticut", "CT", @@ -14046,7 +14046,7 @@ }, { "id": "US_Delaware", - "s": 12238769, + "s": 6419863, "affiliations": [ "Delaware", "DE", @@ -14061,7 +14061,7 @@ "g": [ { "id": "US_Florida_Jacksonville", - "s": 45543901, + "s": 23275136, "affiliations": [ "Florida", "FL", @@ -14073,7 +14073,7 @@ }, { "id": "US_Florida_Miami", - "s": 70774221, + "s": 37935215, "affiliations": [ "Florida", "FL", @@ -14085,7 +14085,7 @@ }, { "id": "US_Florida_Orlando", - "s": 28786253, + "s": 16562460, "affiliations": [ "Florida", "FL", @@ -14097,7 +14097,7 @@ }, { "id": "US_Florida_Tampa", - "s": 60073834, + "s": 27061155, "affiliations": [ "Florida", "FL", @@ -14109,7 +14109,7 @@ }, { "id": "US_Florida_Gainesville", - "s": 37595804, + "s": 19033250, "affiliations": [ "Florida", "FL", @@ -14126,7 +14126,7 @@ "g": [ { "id": "US_Georgia_Atlanta", - "s": 69230459, + "s": 45807049, "affiliations": [ "Georgia", "GA", @@ -14138,7 +14138,7 @@ }, { "id": "US_Georgia_Macon", - "s": 48283657, + "s": 32359855, "affiliations": [ "Georgia", "GA", @@ -14150,7 +14150,7 @@ }, { "id": "US_Georgia_North", - "s": 30743931, + "s": 21134620, "affiliations": [ "Georgia", "GA", @@ -14162,7 +14162,7 @@ }, { "id": "US_Georgia_South", - "s": 46327475, + "s": 25201032, "affiliations": [ "Georgia", "GA", @@ -14176,7 +14176,7 @@ }, { "id": "US_Guam", - "s": 2752594, + "s": 1676980, "affiliations": [ "Guam", "GU", @@ -14191,7 +14191,7 @@ }, { "id": "US_Hawaii", - "s": 11612292, + "s": 7580944, "affiliations": [ "Hawaii", "HI", @@ -14206,7 +14206,7 @@ "g": [ { "id": "US_Idaho_North", - "s": 25842848, + "s": 18747461, "affiliations": [ "Idaho", "ID", @@ -14218,7 +14218,7 @@ }, { "id": "US_Idaho_South", - "s": 39020912, + "s": 20125008, "affiliations": [ "Idaho", "ID", @@ -14235,7 +14235,7 @@ "g": [ { "id": "US_Illinois_South", - "s": 42236419, + "s": 17224540, "affiliations": [ "Illinois", "IL", @@ -14247,7 +14247,7 @@ }, { "id": "US_Illinois_Chickago", - "s": 76865448, + "s": 47701410, "affiliations": [ "Illinois", "IL", @@ -14259,7 +14259,7 @@ }, { "id": "US_Illinois_Elgin", - "s": 31371587, + "s": 13700124, "affiliations": [ "Illinois", "IL", @@ -14271,7 +14271,7 @@ }, { "id": "US_Illinois_Rockford", - "s": 21241683, + "s": 10712103, "affiliations": [ "Illinois", "IL", @@ -14283,7 +14283,7 @@ }, { "id": "US_Illinois_Springfield", - "s": 55294210, + "s": 27942606, "affiliations": [ "Illinois", "IL", @@ -14300,7 +14300,7 @@ "g": [ { "id": "US_Indiana_North", - "s": 52379391, + "s": 18982499, "affiliations": [ "Indiana", "IN", @@ -14312,7 +14312,7 @@ }, { "id": "US_Indiana_Evansville", - "s": 27559962, + "s": 12802177, "affiliations": [ "Indiana", "IN", @@ -14324,7 +14324,7 @@ }, { "id": "US_Indiana_Indianapolis", - "s": 42692863, + "s": 18164545, "affiliations": [ "Indiana", "IN", @@ -14341,7 +14341,7 @@ "g": [ { "id": "US_Iowa_Des Moines", - "s": 37502119, + "s": 21580825, "affiliations": [ "Iowa", "IA", @@ -14353,7 +14353,7 @@ }, { "id": "US_Iowa_Waterloo", - "s": 33165167, + "s": 18135378, "affiliations": [ "Iowa", "IA", @@ -14365,7 +14365,7 @@ }, { "id": "US_Iowa_West", - "s": 40335929, + "s": 20146116, "affiliations": [ "Iowa", "IA", @@ -14382,7 +14382,7 @@ "g": [ { "id": "US_Kansas_East", - "s": 43455513, + "s": 20168637, "affiliations": [ "Kansas", "KS", @@ -14394,7 +14394,7 @@ }, { "id": "US_Kansas_West", - "s": 24125036, + "s": 9561809, "affiliations": [ "Kansas", "KS", @@ -14406,7 +14406,7 @@ }, { "id": "US_Kansas_Wichita", - "s": 37595943, + "s": 13648019, "affiliations": [ "Kansas", "KS", @@ -14423,7 +14423,7 @@ "g": [ { "id": "US_Kentucky_East", - "s": 44798000, + "s": 30451849, "affiliations": [ "Kentucky", "KY", @@ -14435,7 +14435,7 @@ }, { "id": "US_Kentucky_West", - "s": 31104396, + "s": 16952882, "affiliations": [ "Kentucky", "KY", @@ -14447,7 +14447,7 @@ }, { "id": "US_Kentucky_Louisville", - "s": 37525632, + "s": 31323361, "affiliations": [ "Kentucky", "KY", @@ -14464,7 +14464,7 @@ "g": [ { "id": "US_Louisiana_Central", - "s": 50402302, + "s": 28537327, "affiliations": [ "Louisiana", "LA", @@ -14476,7 +14476,7 @@ }, { "id": "US_Louisiana_New Orleans", - "s": 56072801, + "s": 42098712, "affiliations": [ "Louisiana", "LA", @@ -14490,7 +14490,7 @@ }, { "id": "US_Maine", - "s": 43268847, + "s": 30906089, "affiliations": [ "Maine", "ME", @@ -14505,7 +14505,7 @@ "g": [ { "id": "US_Maryland_Baltimore", - "s": 94265297, + "s": 65537548, "affiliations": [ "Maryland", "MD", @@ -14517,7 +14517,7 @@ }, { "id": "US_Maryland_and_DC", - "s": 54261058, + "s": 31433182, "affiliations": [ "District of Columbia", "DC", @@ -14537,7 +14537,7 @@ "g": [ { "id": "US_Massachusetts_Boston", - "s": 67417537, + "s": 52101071, "affiliations": [ "Massachusetts", "MA", @@ -14549,7 +14549,7 @@ }, { "id": "US_Massachusetts_Central", - "s": 31376758, + "s": 24774716, "affiliations": [ "Massachusetts", "MA", @@ -14561,7 +14561,7 @@ }, { "id": "US_Massachusetts_Plymouth", - "s": 33761111, + "s": 26914958, "affiliations": [ "Massachusetts", "MA", @@ -14573,7 +14573,7 @@ }, { "id": "US_Massachusetts_Southeastern", - "s": 16675000, + "s": 13237354, "affiliations": [ "Massachusetts", "MA", @@ -14585,7 +14585,7 @@ }, { "id": "US_Massachusetts_West", - "s": 26855166, + "s": 21455894, "affiliations": [ "Massachusetts", "MA", @@ -14602,7 +14602,7 @@ "g": [ { "id": "US_Michigan_Detroit", - "s": 50602452, + "s": 23489885, "affiliations": [ "Michigan", "MI", @@ -14614,7 +14614,7 @@ }, { "id": "US_Michigan_North", - "s": 34714196, + "s": 29523238, "affiliations": [ "Michigan", "MI", @@ -14626,7 +14626,7 @@ }, { "id": "US_Michigan_Grand Rapids", - "s": 42192010, + "s": 19767761, "affiliations": [ "Little Traverse Bay Band of Odawas Reservation", "Little Traverse Bay Bands Of Odawa Reservation", @@ -14644,7 +14644,7 @@ }, { "id": "US_Michigan_Lansing", - "s": 45302716, + "s": 21592857, "affiliations": [ "Little Traverse Bay Band of Odawas Reservation", "Little Traverse Bay Bands of Odawas Reservation", @@ -14663,7 +14663,7 @@ "g": [ { "id": "US_Minnesota_Rochester", - "s": 43289990, + "s": 26012586, "affiliations": [ "Minnesota", "MN", @@ -14675,7 +14675,7 @@ }, { "id": "US_Minnesota_Minneapolis", - "s": 42974352, + "s": 22437366, "affiliations": [ "Minnesota", "MN", @@ -14687,7 +14687,7 @@ }, { "id": "US_Minnesota_North", - "s": 48087828, + "s": 36934781, "affiliations": [ "Minnesota", "MN", @@ -14699,7 +14699,7 @@ }, { "id": "US_Minnesota_Saint Cloud", - "s": 35965943, + "s": 22741794, "affiliations": [ "Minnesota", "MN", @@ -14716,7 +14716,7 @@ "g": [ { "id": "US_Mississippi_Gulfport", - "s": 23041906, + "s": 17557153, "affiliations": [ "Mississippi", "MS", @@ -14728,7 +14728,7 @@ }, { "id": "US_Mississippi_North", - "s": 51196681, + "s": 26417801, "affiliations": [ "Mississippi", "MS", @@ -14745,7 +14745,7 @@ "g": [ { "id": "US_Missouri_East", - "s": 17046548, + "s": 8264825, "affiliations": [ "Missouri", "MO", @@ -14757,7 +14757,7 @@ }, { "id": "US_Missouri_Springfield", - "s": 38983199, + "s": 18957790, "affiliations": [ "Missouri", "MO", @@ -14769,7 +14769,7 @@ }, { "id": "US_Missouri_Kansas", - "s": 36720796, + "s": 16743645, "affiliations": [ "Missouri", "MO", @@ -14781,7 +14781,7 @@ }, { "id": "US_Missouri_St Louis", - "s": 43795235, + "s": 20909314, "affiliations": [ "Missouri", "MO", @@ -14798,7 +14798,7 @@ "g": [ { "id": "US_Montana_East", - "s": 35313773, + "s": 23277711, "affiliations": [ "Montana", "MT", @@ -14810,7 +14810,7 @@ }, { "id": "US_Montana_West", - "s": 33410741, + "s": 23095173, "affiliations": [ "Montana", "MT", @@ -14827,7 +14827,7 @@ "g": [ { "id": "US_Nebraska_East", - "s": 38428034, + "s": 18002852, "affiliations": [ "Nebraska", "NE", @@ -14839,7 +14839,7 @@ }, { "id": "US_Nebraska_West", - "s": 46075752, + "s": 22029872, "affiliations": [ "Nebraska", "NE", @@ -14853,7 +14853,7 @@ }, { "id": "US_Nevada", - "s": 42829927, + "s": 28332986, "affiliations": [ "Nevada", "NV", @@ -14865,7 +14865,7 @@ }, { "id": "US_New Hampshire", - "s": 37024072, + "s": 25357251, "affiliations": [ "New Hampshire", "NH", @@ -14880,7 +14880,7 @@ "g": [ { "id": "US_New Jersey_North", - "s": 44078553, + "s": 24327424, "affiliations": [ "New Jersey", "NJ", @@ -14892,7 +14892,7 @@ }, { "id": "US_New Jersey_South", - "s": 54185695, + "s": 31755899, "affiliations": [ "New Jersey", "NJ", @@ -14909,7 +14909,7 @@ "g": [ { "id": "US_New Mexico_Albuquerque", - "s": 40701968, + "s": 22771631, "affiliations": [ "New Mexico", "NM", @@ -14921,7 +14921,7 @@ }, { "id": "US_New Mexico_Roswell", - "s": 43513838, + "s": 22640410, "affiliations": [ "New Mexico", "NM", @@ -14938,7 +14938,7 @@ "g": [ { "id": "US_New York_East", - "s": 70704809, + "s": 50265895, "affiliations": [ "Gardiners Island", "New York", @@ -14951,7 +14951,7 @@ }, { "id": "US_New York_New York", - "s": 79067693, + "s": 70438170, "affiliations": [ "Ellis Island (historical)", "Liberty Island", @@ -14965,7 +14965,7 @@ }, { "id": "US_New York_North", - "s": 44622371, + "s": 27211860, "affiliations": [ "New York", "NY", @@ -14977,7 +14977,7 @@ }, { "id": "US_New York_West", - "s": 64978240, + "s": 35367246, "affiliations": [ "New York", "NY", @@ -14994,7 +14994,7 @@ "g": [ { "id": "US_North Carolina_Wilson", - "s": 32529316, + "s": 23166110, "affiliations": [ "North Carolina", "NC", @@ -15006,7 +15006,7 @@ }, { "id": "US_North Carolina_Asheville", - "s": 29583507, + "s": 20890819, "affiliations": [ "North Carolina", "NC", @@ -15018,7 +15018,7 @@ }, { "id": "US_North Carolina_Charlotte", - "s": 42277923, + "s": 27061263, "affiliations": [ "North Carolina", "NC", @@ -15030,7 +15030,7 @@ }, { "id": "US_North Carolina_Greensboro", - "s": 35536126, + "s": 22304137, "affiliations": [ "North Carolina", "NC", @@ -15042,7 +15042,7 @@ }, { "id": "US_North Carolina_Raleigh", - "s": 43172377, + "s": 29760732, "affiliations": [ "North Carolina", "NC", @@ -15054,7 +15054,7 @@ }, { "id": "US_North Carolina_Wilmington", - "s": 31396685, + "s": 20401792, "affiliations": [ "North Carolina", "NC", @@ -15071,7 +15071,7 @@ "g": [ { "id": "US_North Dakota_Bismarck", - "s": 23527954, + "s": 14231008, "affiliations": [ "North Dakota", "ND", @@ -15083,7 +15083,7 @@ }, { "id": "US_North Dakota_East", - "s": 35850272, + "s": 25479307, "affiliations": [ "North Dakota", "ND", @@ -15095,7 +15095,7 @@ }, { "id": "US_North Dakota_Minot", - "s": 22478419, + "s": 13492282, "affiliations": [ "North Dakota", "ND", @@ -15112,7 +15112,7 @@ "g": [ { "id": "US_Ohio_Cleveland", - "s": 52296563, + "s": 22960718, "affiliations": [ "Ohio", "OH", @@ -15124,7 +15124,7 @@ }, { "id": "US_Ohio_Cincinnati", - "s": 44871241, + "s": 21001865, "affiliations": [ "Ohio", "OH", @@ -15136,7 +15136,7 @@ }, { "id": "US_Ohio_Columbus", - "s": 35622405, + "s": 16600606, "affiliations": [ "Ohio", "OH", @@ -15148,7 +15148,7 @@ }, { "id": "US_Ohio_Toledo", - "s": 29609646, + "s": 12894890, "affiliations": [ "Ohio", "OH", @@ -15165,7 +15165,7 @@ "g": [ { "id": "US_Oklahoma_East", - "s": 21020335, + "s": 14100547, "affiliations": [ "Oklahoma", "OK", @@ -15177,7 +15177,7 @@ }, { "id": "US_Oklahoma_West", - "s": 25448236, + "s": 14586230, "affiliations": [ "Oklahoma", "OK", @@ -15189,7 +15189,7 @@ }, { "id": "US_Oklahoma_Tulsa", - "s": 42216300, + "s": 23870519, "affiliations": [ "Oklahoma", "OK", @@ -15201,7 +15201,7 @@ }, { "id": "US_Oklahoma_Oklahoma", - "s": 41177340, + "s": 19307426, "affiliations": [ "Oklahoma", "OK", @@ -15218,7 +15218,7 @@ "g": [ { "id": "US_Oregon_Eugene", - "s": 31435741, + "s": 21898166, "affiliations": [ "Oregon", "OR", @@ -15230,7 +15230,7 @@ }, { "id": "US_Oregon_Portland", - "s": 85389898, + "s": 64730124, "affiliations": [ "Oregon", "OR", @@ -15242,7 +15242,7 @@ }, { "id": "US_Oregon_West", - "s": 34874409, + "s": 24501641, "affiliations": [ "Oregon", "OR", @@ -15259,7 +15259,7 @@ "g": [ { "id": "US_Pennsylvania_Central", - "s": 55164161, + "s": 30126093, "affiliations": [ "Pennsylvania", "PA", @@ -15271,7 +15271,7 @@ }, { "id": "US_Pennsylvania_Pittsburgh", - "s": 48057661, + "s": 23324768, "affiliations": [ "Pennsylvania", "PA", @@ -15283,7 +15283,7 @@ }, { "id": "US_Pennsylvania_Reading", - "s": 46355413, + "s": 21887286, "affiliations": [ "Pennsylvania", "PA", @@ -15295,7 +15295,7 @@ }, { "id": "US_Pennsylvania_Scranton", - "s": 51599193, + "s": 25914265, "affiliations": [ "Pennsylvania", "PA", @@ -15309,7 +15309,7 @@ }, { "id": "US_Puerto Rico", - "s": 37802785, + "s": 22445034, "affiliations": [ "Puerto Rico", "PR", @@ -15322,7 +15322,7 @@ }, { "id": "US_Rhode Island", - "s": 12267782, + "s": 6173787, "affiliations": [ "Patience Island", "Rhode Island", @@ -15338,7 +15338,7 @@ "g": [ { "id": "US_South Carolina_Charleston", - "s": 25158911, + "s": 18128710, "affiliations": [ "South Carolina", "SC", @@ -15350,7 +15350,7 @@ }, { "id": "US_South Carolina_Columbia", - "s": 46228711, + "s": 25801155, "affiliations": [ "South Carolina", "SC", @@ -15362,7 +15362,7 @@ }, { "id": "US_South Carolina_Florence", - "s": 33286394, + "s": 20440706, "affiliations": [ "South Carolina", "SC", @@ -15376,7 +15376,7 @@ }, { "id": "US_South Dakota", - "s": 42459068, + "s": 22074669, "affiliations": [ "South Dakota", "SD", @@ -15391,7 +15391,7 @@ "g": [ { "id": "US_Tennessee_East", - "s": 60972554, + "s": 34596541, "affiliations": [ "Tennessee", "TN", @@ -15403,7 +15403,7 @@ }, { "id": "US_Tennessee_West", - "s": 45530154, + "s": 21943265, "affiliations": [ "Tennessee", "TN", @@ -15420,7 +15420,7 @@ "g": [ { "id": "US_Texas_Austin", - "s": 61646274, + "s": 44852351, "affiliations": [ "Texas", "TX", @@ -15432,7 +15432,7 @@ }, { "id": "US_Texas_Victoria", - "s": 19263474, + "s": 10289982, "affiliations": [ "Texas", "TX", @@ -15444,7 +15444,7 @@ }, { "id": "US_Texas_Dallas", - "s": 78362464, + "s": 40001478, "affiliations": [ "Texas", "TX", @@ -15456,7 +15456,7 @@ }, { "id": "US_Texas_Houston", - "s": 70433344, + "s": 29536290, "affiliations": [ "Texas", "TX", @@ -15468,7 +15468,7 @@ }, { "id": "US_Texas_Amarillo", - "s": 28421709, + "s": 10565460, "affiliations": [ "Texas", "TX", @@ -15480,7 +15480,7 @@ }, { "id": "US_Texas_Lubbock", - "s": 33736929, + "s": 11394407, "affiliations": [ "Texas", "TX", @@ -15492,7 +15492,7 @@ }, { "id": "US_Texas_San Antonio", - "s": 43366073, + "s": 18882708, "affiliations": [ "Texas", "TX", @@ -15504,7 +15504,7 @@ }, { "id": "US_Texas_Southwest", - "s": 31733182, + "s": 15739428, "affiliations": [ "Texas", "TX", @@ -15516,7 +15516,7 @@ }, { "id": "US_Texas_Tyler", - "s": 43166106, + "s": 20083459, "affiliations": [ "Texas", "TX", @@ -15528,7 +15528,7 @@ }, { "id": "US_Texas_Wako", - "s": 31380066, + "s": 16361813, "affiliations": [ "Texas", "TX", @@ -15540,7 +15540,7 @@ }, { "id": "US_Texas_West", - "s": 48430588, + "s": 19053481, "affiliations": [ "Texas", "TX", @@ -15554,7 +15554,7 @@ }, { "id": "US_United States Minor Outlying Islands", - "s": 505050, + "s": 497192, "affiliations": [ "Navassa Island", "United States Minor Outlying Islands" @@ -15565,7 +15565,7 @@ "g": [ { "id": "US_Utah_South", - "s": 20544087, + "s": 17049350, "affiliations": [ "United States of America", "Utah", @@ -15577,7 +15577,7 @@ }, { "id": "US_Utah_North", - "s": 40841206, + "s": 23909125, "affiliations": [ "United States of America", "Utah", @@ -15591,7 +15591,7 @@ }, { "id": "US_Vermont", - "s": 19083031, + "s": 13531160, "affiliations": [ "United States of America", "Vermont", @@ -15606,7 +15606,7 @@ "g": [ { "id": "US_Virginia_Roanoke", - "s": 43032009, + "s": 28319081, "affiliations": [ "Virginia", "VA", @@ -15618,7 +15618,7 @@ }, { "id": "US_Virginia_Norfolk", - "s": 71784958, + "s": 54548854, "affiliations": [ "Virginia", "VA", @@ -15630,7 +15630,7 @@ }, { "id": "US_Virginia_Lynchburg", - "s": 50928871, + "s": 35389109, "affiliations": [ "Virginia", "VA", @@ -15642,7 +15642,7 @@ }, { "id": "US_Virginia_Richmond", - "s": 27425807, + "s": 16148030, "affiliations": [ "Virginia", "VA", @@ -15654,7 +15654,7 @@ }, { "id": "US_Virginia_Alexandria", - "s": 42644835, + "s": 25045182, "affiliations": [ "Virginia", "VA", @@ -15671,7 +15671,7 @@ "g": [ { "id": "US_Washington_Coast", - "s": 59570927, + "s": 36217590, "affiliations": [ "Puyallup Tribe", "Puyallup Tribe Reservation", @@ -15685,7 +15685,7 @@ }, { "id": "US_Washington_Seattle", - "s": 55327393, + "s": 36673948, "affiliations": [ "United States of America", "Washington", @@ -15697,7 +15697,7 @@ }, { "id": "US_Washington_Yakima", - "s": 42439629, + "s": 23974515, "affiliations": [ "United States of America", "Washington", @@ -15711,7 +15711,7 @@ }, { "id": "US_West Virginia", - "s": 42412257, + "s": 23670699, "affiliations": [ "United States of America", "West Virginia", @@ -15726,7 +15726,7 @@ "g": [ { "id": "US_Wisconsin_Milwaukee", - "s": 46716351, + "s": 21136332, "affiliations": [ "United States of America", "Wisconsin", @@ -15738,7 +15738,7 @@ }, { "id": "US_Wisconsin_North", - "s": 30357952, + "s": 22237483, "affiliations": [ "United States of America", "Wisconsin", @@ -15750,7 +15750,7 @@ }, { "id": "US_Wisconsin_Madison", - "s": 33852706, + "s": 19718235, "affiliations": [ "United States of America", "Wisconsin", @@ -15762,7 +15762,7 @@ }, { "id": "US_Wisconsin_Eau Claire", - "s": 30570016, + "s": 19287677, "affiliations": [ "United States of America", "Wisconsin", @@ -15776,7 +15776,7 @@ }, { "id": "US_Wyoming", - "s": 41141944, + "s": 29988655, "affiliations": [ "United States of America", "Wyoming", @@ -15790,7 +15790,7 @@ }, { "id": "Uruguay", - "s": 34281549, + "s": 19489617, "affiliations": [ "Cerro Largo", "Artigas", @@ -15820,7 +15820,7 @@ }, { "id": "Uzbekistan", - "s": 54328962, + "s": 27652992, "affiliations": [ "Andijon Viloyati", "Border Kyrgyzstan - Uzbekistan", @@ -15845,7 +15845,7 @@ }, { "id": "Vanuatu", - "s": 3773605, + "s": 3574065, "affiliations": [ "Malampa", "Penama", @@ -15864,7 +15864,7 @@ "g": [ { "id": "Venezuela_North", - "s": 36011050, + "s": 15585652, "affiliations": [ "Barinas", "Carabobo", @@ -15896,7 +15896,7 @@ }, { "id": "Venezuela_South", - "s": 29879140, + "s": 14044175, "affiliations": [ "Amazonas", "Apure", @@ -15919,7 +15919,7 @@ }, { "id": "Vietnam", - "s": 62867866, + "s": 38058933, "affiliations": [ "T\u1ec9nh H\u00e0 Nam", "T\u1ec9nh H\u00e0 T\u0129nh", @@ -15992,7 +15992,7 @@ }, { "id": "Yemen", - "s": 21739330, + "s": 15646869, "affiliations": [ "Abyan", "Ad Dali'", @@ -16023,7 +16023,7 @@ }, { "id": "Zambia", - "s": 41907300, + "s": 34440107, "affiliations": [ "Central Province", "Copperbelt Province", @@ -16043,7 +16043,7 @@ }, { "id": "Zimbabwe", - "s": 29650022, + "s": 57823312, "affiliations": [ "Bulawayo Province", "Mashonaland Central", @@ -16063,7 +16063,7 @@ }, { "id": "Antarctica", - "s": 15313568, + "s": 15343400, "affiliations": [ "South Georgia and South Sandwich Islands" ] @@ -16073,7 +16073,7 @@ "g": [ { "id": "Tokelau", - "s": 83286, + "s": 81989, "affiliations": [ "Tokelau" ], @@ -16083,7 +16083,7 @@ }, { "id": "New Zealand North_Auckland", - "s": 57072044, + "s": 50321592, "affiliations": [ "Auckland", "Bay of Plenty", @@ -16097,7 +16097,7 @@ }, { "id": "New Zealand North_Wellington", - "s": 44147612, + "s": 40320886, "affiliations": [ "Gisborne", "Hawke's Bay", @@ -16112,7 +16112,7 @@ }, { "id": "New Zealand South_Canterbury", - "s": 42775004, + "s": 39555748, "affiliations": [ "Canterbury", "Chatham Islands", @@ -16128,7 +16128,7 @@ }, { "id": "New Zealand South_Southland", - "s": 30834043, + "s": 29392587, "affiliations": [ "New Zealand/Aotearoa", "Otago", @@ -16146,7 +16146,7 @@ "g": [ { "id": "South Korea_North", - "s": 93115436, + "s": 53190155, "affiliations": [ "\uac15\uc6d0\ub3c4", "\uacbd\uae30\ub3c4", @@ -16165,7 +16165,7 @@ }, { "id": "South Korea_South", - "s": 75333420, + "s": 45206366, "affiliations": [ "\uc81c\uc8fc\ub3c4", "Gyeongnam-Busan Border", diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 456f90474a..60db19b2b4 100644 Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 972c0e838f..1444d2894c 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -5,7 +5,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: BEVELJOIN cap: BUTTCAP } @@ -16,14 +16,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: BEVELJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -32,7 +32,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -43,14 +43,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -59,7 +59,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -70,14 +70,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 } } element { @@ -85,7 +85,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -96,14 +96,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -112,7 +112,7 @@ cont { stroke_color: 1308622847 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -120,7 +120,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -131,14 +131,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -147,7 +147,7 @@ cont { stroke_color: 1308622847 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -155,7 +155,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -166,14 +166,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -182,7 +182,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -190,7 +190,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -201,14 +201,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -217,7 +217,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -225,7 +225,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -236,14 +236,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -252,7 +252,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } } @@ -263,7 +263,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: BEVELJOIN cap: BUTTCAP } @@ -274,14 +274,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: BEVELJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -290,7 +290,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -301,14 +301,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -317,7 +317,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -328,14 +328,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 } } element { @@ -343,7 +343,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -354,14 +354,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -370,7 +370,7 @@ cont { stroke_color: 1308622847 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -378,7 +378,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -389,14 +389,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -405,7 +405,7 @@ cont { stroke_color: 1308622847 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -413,7 +413,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -424,14 +424,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -440,7 +440,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -448,7 +448,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -459,14 +459,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -475,7 +475,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -483,7 +483,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -494,14 +494,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -510,7 +510,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } } @@ -521,7 +521,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1459 + priority: 1504 join: BEVELJOIN cap: BUTTCAP } @@ -532,7 +532,7 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: BEVELJOIN cap: BUTTCAP } @@ -542,7 +542,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1459 + priority: 1504 join: ROUNDJOIN cap: BUTTCAP } @@ -553,7 +553,7 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } @@ -563,7 +563,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1459 + priority: 1504 join: ROUNDJOIN cap: BUTTCAP } @@ -574,7 +574,7 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } @@ -584,7 +584,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -595,14 +595,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -611,7 +611,7 @@ cont { stroke_color: 1308622847 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -619,7 +619,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -630,14 +630,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -646,7 +646,7 @@ cont { stroke_color: 1308622847 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -654,7 +654,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -665,14 +665,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -681,7 +681,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -689,7 +689,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -700,14 +700,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -716,7 +716,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -724,7 +724,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -735,14 +735,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -751,7 +751,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } } @@ -762,7 +762,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: BEVELJOIN cap: BUTTCAP } @@ -773,14 +773,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: BEVELJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -789,7 +789,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -800,14 +800,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -816,7 +816,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -827,14 +827,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 } } element { @@ -842,7 +842,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -853,14 +853,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -869,7 +869,7 @@ cont { stroke_color: 1308622847 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -877,7 +877,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -888,14 +888,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -904,7 +904,7 @@ cont { stroke_color: 1308622847 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -912,7 +912,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -923,14 +923,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -939,7 +939,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -947,7 +947,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -958,14 +958,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -974,7 +974,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -982,7 +982,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -993,14 +993,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1009,7 +1009,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } } @@ -1020,7 +1020,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: BEVELJOIN cap: BUTTCAP } @@ -1031,14 +1031,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: BEVELJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -1047,7 +1047,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -1058,14 +1058,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -1074,7 +1074,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -1085,14 +1085,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 } } element { @@ -1100,7 +1100,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -1111,14 +1111,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1127,7 +1127,7 @@ cont { stroke_color: 1308622847 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -1135,7 +1135,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -1146,14 +1146,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1162,7 +1162,7 @@ cont { stroke_color: 1308622847 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -1170,7 +1170,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -1181,14 +1181,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1197,7 +1197,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -1205,7 +1205,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -1216,14 +1216,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1232,7 +1232,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -1240,7 +1240,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -1251,14 +1251,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1267,7 +1267,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } } @@ -1278,7 +1278,7 @@ cont { symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -1287,7 +1287,7 @@ cont { symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -1296,7 +1296,7 @@ cont { symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 } } element { @@ -1304,7 +1304,7 @@ cont { symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1313,7 +1313,7 @@ cont { stroke_color: 1308622847 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -1321,7 +1321,7 @@ cont { symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1330,7 +1330,7 @@ cont { stroke_color: 1308622847 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -1338,7 +1338,7 @@ cont { symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1347,7 +1347,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -1355,7 +1355,7 @@ cont { symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1364,7 +1364,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -1372,7 +1372,7 @@ cont { symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1381,7 +1381,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } } @@ -1391,7 +1391,7 @@ cont { scale: 10 area { color: 13942770 - priority: -15046 + priority: -15050 } caption { primary { @@ -1399,14 +1399,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 15954 + priority: 15950 } } element { scale: 11 area { color: 13942770 - priority: -15046 + priority: -15050 } caption { primary { @@ -1414,14 +1414,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 15954 + priority: 15950 } } element { scale: 12 area { color: 13746411 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" @@ -1441,14 +1441,14 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 13 area { color: 13615592 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" @@ -1468,14 +1468,14 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 14 area { color: 13484259 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" @@ -1495,18 +1495,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 15 area { color: 13155550 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" - priority: 16954 + priority: 16950 } caption { primary { @@ -1522,18 +1522,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 16 area { color: 13155550 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" - priority: 16954 + priority: 16950 } caption { primary { @@ -1549,18 +1549,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 17 area { color: 13155550 - priority: -15046 + priority: -15050 } symbol { name: "airport-l" - priority: 16954 + priority: 16950 } caption { primary { @@ -1576,18 +1576,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 18 area { color: 13155550 - priority: -15046 + priority: -15050 } symbol { name: "airport-l" - priority: 16954 + priority: 16950 } caption { primary { @@ -1603,18 +1603,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 19 area { color: 13155550 - priority: -15046 + priority: -15050 } symbol { name: "airport-l" - priority: 16954 + priority: 16950 } caption { primary { @@ -1630,7 +1630,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } } @@ -1640,11 +1640,11 @@ cont { scale: 10 area { color: 13942770 - priority: -15046 + priority: -15050 } symbol { name: "airport-s" - priority: 16954 + priority: 16950 } caption { primary { @@ -1653,14 +1653,14 @@ cont { stroke_color: 1308622847 offset_y: 7 } - priority: 15954 + priority: 15950 } } element { scale: 11 area { color: 13942770 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" @@ -1673,14 +1673,14 @@ cont { stroke_color: 1308622847 offset_y: 7 } - priority: 15954 + priority: 15950 } } element { scale: 12 area { color: 13746411 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" @@ -1700,14 +1700,14 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 13 area { color: 13615592 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" @@ -1727,14 +1727,14 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 14 area { color: 13484259 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" @@ -1754,18 +1754,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 15 area { color: 13155550 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" - priority: 16954 + priority: 16950 } caption { primary { @@ -1781,18 +1781,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 16 area { color: 13155550 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" - priority: 16954 + priority: 16950 } caption { primary { @@ -1808,18 +1808,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 17 area { color: 13155550 - priority: -15046 + priority: -15050 } symbol { name: "airport-l" - priority: 16954 + priority: 16950 } caption { primary { @@ -1835,18 +1835,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 18 area { color: 13155550 - priority: -15046 + priority: -15050 } symbol { name: "airport-l" - priority: 16954 + priority: 16950 } caption { primary { @@ -1862,18 +1862,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 19 area { color: 13155550 - priority: -15046 + priority: -15050 } symbol { name: "airport-l" - priority: 16954 + priority: 16950 } caption { primary { @@ -1889,7 +1889,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } } @@ -1899,7 +1899,7 @@ cont { scale: 17 symbol { name: "gate-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -1907,14 +1907,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "gate-l" - priority: 16981 + priority: 16980 } caption { primary { @@ -1922,14 +1922,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15981 + priority: 15980 } } element { scale: 19 symbol { name: "gate-l" - priority: 16981 + priority: 16980 } caption { primary { @@ -1937,7 +1937,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15981 + priority: 15980 } } } @@ -1947,7 +1947,7 @@ cont { scale: 17 symbol { name: "helipad-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -1955,14 +1955,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "helipad-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -1970,14 +1970,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "helipad-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -1985,7 +1985,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -1996,7 +1996,7 @@ cont { lines { width: 1.0 color: 2163800312 - priority: 1135 + priority: 1148 join: BEVELJOIN cap: BUTTCAP } @@ -2006,7 +2006,7 @@ cont { lines { width: 1.5 color: 871954680 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: BUTTCAP } @@ -2016,7 +2016,7 @@ cont { lines { width: 2.4 color: 16316664 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: BUTTCAP } @@ -2026,7 +2026,7 @@ cont { lines { width: 2.4 color: 16316664 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: BUTTCAP } @@ -2036,7 +2036,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: ROUNDCAP } @@ -2046,7 +2046,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: ROUNDCAP } @@ -2056,7 +2056,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: ROUNDCAP } @@ -2066,7 +2066,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: ROUNDCAP } @@ -2079,7 +2079,7 @@ cont { lines { width: 0.6 color: 1727592696 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: BUTTCAP } @@ -2089,7 +2089,7 @@ cont { lines { width: 1.2 color: 1727592696 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: BUTTCAP } @@ -2099,7 +2099,7 @@ cont { lines { width: 1.2 color: 1727592696 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: ROUNDCAP } @@ -2109,7 +2109,7 @@ cont { lines { width: 1.2 color: 1727592696 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: ROUNDCAP } @@ -2119,7 +2119,7 @@ cont { lines { width: 1.2 color: 1727592696 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: ROUNDCAP } @@ -2129,7 +2129,7 @@ cont { lines { width: 1.2 color: 1727592696 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: ROUNDCAP } @@ -2145,7 +2145,7 @@ cont { width: 1.0 color: 10592406 } - priority: -15793 + priority: -15773 } } element { @@ -2156,14 +2156,14 @@ cont { width: 1.0 color: 10592406 } - priority: -15793 + priority: -15773 } caption { primary { height: 9 color: 6381914 } - priority: 15207 + priority: 15227 } } element { @@ -2174,14 +2174,14 @@ cont { width: 1.0 color: 10197647 } - priority: -15793 + priority: -15773 } caption { primary { height: 9 color: 6381914 } - priority: 15207 + priority: 15227 } } element { @@ -2192,14 +2192,14 @@ cont { width: 1.0 color: 10197647 } - priority: -15793 + priority: -15773 } caption { primary { height: 9 color: 6381914 } - priority: 15207 + priority: 15227 } } element { @@ -2210,14 +2210,14 @@ cont { width: 1.0 color: 10197647 } - priority: -15793 + priority: -15773 } caption { primary { height: 9 color: 6381914 } - priority: 15207 + priority: 15227 } } element { @@ -2228,14 +2228,14 @@ cont { width: 1.0 color: 10197647 } - priority: -15793 + priority: -15773 } caption { primary { height: 9 color: 6381914 } - priority: 15207 + priority: 15227 } } } @@ -2259,7 +2259,7 @@ cont { scale: 18 symbol { name: "atm-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -2267,14 +2267,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "atm-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -2282,7 +2282,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -2292,7 +2292,7 @@ cont { scale: 16 symbol { name: "bank-m" - priority: 16594 + priority: 16653 } caption { primary { @@ -2300,14 +2300,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { scale: 17 symbol { name: "bank-m" - priority: 16594 + priority: 16653 } caption { primary { @@ -2315,14 +2315,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "bank-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -2330,14 +2330,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "bank-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -2345,7 +2345,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -2355,7 +2355,7 @@ cont { scale: 15 symbol { name: "beer-m" - priority: 16621 + priority: 16683 min_distance: 28 } caption { @@ -2364,14 +2364,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15621 + priority: 15683 } } element { scale: 16 symbol { name: "beer-m" - priority: 16621 + priority: 16683 min_distance: 12 } caption { @@ -2380,14 +2380,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15621 + priority: 15683 } } element { scale: 17 symbol { name: "beer-l" - priority: 16621 + priority: 16683 min_distance: 12 } caption { @@ -2396,14 +2396,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15621 + priority: 15683 } } element { scale: 18 symbol { name: "beer-l" - priority: 16621 + priority: 16683 } caption { primary { @@ -2411,14 +2411,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15621 + priority: 15683 } } element { scale: 19 symbol { name: "beer-l" - priority: 16621 + priority: 16683 } caption { primary { @@ -2426,7 +2426,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15621 + priority: 15683 } } } @@ -2436,7 +2436,7 @@ cont { scale: 18 symbol { name: "bbq-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -2451,7 +2451,7 @@ cont { scale: 19 symbol { name: "bbq-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -2470,7 +2470,7 @@ cont { symbol { name: "bench" apply_for_type: 1 - priority: 16522 + priority: 16574 } } element { @@ -2478,7 +2478,7 @@ cont { symbol { name: "bench" apply_for_type: 1 - priority: 16522 + priority: 16574 } caption { primary { @@ -2486,7 +2486,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15522 + priority: 15574 } } } @@ -2496,7 +2496,7 @@ cont { scale: 17 symbol { name: "bike-parking-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -2505,14 +2505,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "bike-parking-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -2521,14 +2521,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "bike-parking-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -2537,7 +2537,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -2547,7 +2547,7 @@ cont { scale: 17 symbol { name: "bicycle-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -2555,14 +2555,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 18 symbol { name: "bicycle-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -2570,14 +2570,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "bicycle-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -2585,7 +2585,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -2610,7 +2610,7 @@ cont { symbol { name: "banknote-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } } element { @@ -2618,7 +2618,7 @@ cont { symbol { name: "banknote-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } caption { primary { @@ -2626,7 +2626,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { @@ -2634,7 +2634,7 @@ cont { symbol { name: "banknote-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } caption { primary { @@ -2642,7 +2642,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -2652,7 +2652,7 @@ cont { scale: 12 symbol { name: "bus-s" - priority: 16603 + priority: 16663 min_distance: 1 } } @@ -2660,7 +2660,7 @@ cont { scale: 13 symbol { name: "bus-s" - priority: 16603 + priority: 16663 min_distance: 1 } } @@ -2668,7 +2668,7 @@ cont { scale: 14 symbol { name: "bus-s" - priority: 16603 + priority: 16663 } caption { primary { @@ -2684,14 +2684,14 @@ cont { offset_y: 20 text: "int_name" } - priority: 15603 + priority: 15663 } } element { scale: 15 symbol { name: "bus-m" - priority: 16603 + priority: 16663 } caption { primary { @@ -2707,14 +2707,14 @@ cont { offset_y: 8 text: "int_name" } - priority: 15603 + priority: 15663 } } element { scale: 16 symbol { name: "bus-m" - priority: 16603 + priority: 16663 } caption { primary { @@ -2730,14 +2730,14 @@ cont { offset_y: 8 text: "int_name" } - priority: 15603 + priority: 15663 } } element { scale: 17 symbol { name: "bus-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -2753,14 +2753,14 @@ cont { offset_y: 8 text: "int_name" } - priority: 15603 + priority: 15663 } } element { scale: 18 symbol { name: "bus-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -2776,14 +2776,14 @@ cont { offset_y: 8 text: "int_name" } - priority: 15603 + priority: 15663 } } element { scale: 19 symbol { name: "bus-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -2799,7 +2799,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15603 + priority: 15663 } } } @@ -2809,7 +2809,7 @@ cont { scale: 15 symbol { name: "cafe-m" - priority: 16648 + priority: 16712 min_distance: 12 } caption { @@ -2818,14 +2818,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15648 + priority: 15712 } } element { scale: 16 symbol { name: "cafe-m" - priority: 16648 + priority: 16712 min_distance: 12 } caption { @@ -2834,14 +2834,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15648 + priority: 15712 } } element { scale: 17 symbol { name: "cafe-l" - priority: 16648 + priority: 16712 min_distance: 12 } caption { @@ -2850,14 +2850,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15648 + priority: 15712 } } element { scale: 18 symbol { name: "cafe-l" - priority: 16648 + priority: 16712 } caption { primary { @@ -2865,14 +2865,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15648 + priority: 15712 } } element { scale: 19 symbol { name: "cafe-l" - priority: 16648 + priority: 16712 } caption { primary { @@ -2880,7 +2880,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15648 + priority: 15712 } } } @@ -2890,7 +2890,7 @@ cont { scale: 18 symbol { name: "car_sharing-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -2898,14 +2898,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "car_sharing-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -2913,7 +2913,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -2923,7 +2923,7 @@ cont { scale: 18 symbol { name: "car_sharing-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -2931,14 +2931,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "car_sharing-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -2946,7 +2946,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -2956,7 +2956,7 @@ cont { scale: 17 symbol { name: "car-wash-l" - priority: 16567 + priority: 16623 min_distance: 24 } caption { @@ -2965,7 +2965,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { @@ -2973,7 +2973,7 @@ cont { symbol { name: "car-wash-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } caption { primary { @@ -2981,7 +2981,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { @@ -2989,7 +2989,7 @@ cont { symbol { name: "car-wash-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } caption { primary { @@ -2997,7 +2997,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -3007,7 +3007,7 @@ cont { scale: 17 symbol { name: "casino-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -3016,14 +3016,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "casino-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -3032,14 +3032,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "casino-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -3048,7 +3048,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -3058,7 +3058,7 @@ cont { scale: 14 symbol { name: "charging-station-s" - priority: 16585 + priority: 16643 min_distance: 20 } caption { @@ -3074,7 +3074,7 @@ cont { scale: 15 symbol { name: "charging-station-m" - priority: 16585 + priority: 16643 min_distance: 20 } caption { @@ -3090,7 +3090,7 @@ cont { scale: 16 symbol { name: "charging-station-m" - priority: 16585 + priority: 16643 min_distance: 10 } caption { @@ -3106,7 +3106,7 @@ cont { scale: 17 symbol { name: "charging-station-l" - priority: 16585 + priority: 16643 } caption { primary { @@ -3114,14 +3114,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15585 + priority: 15643 } } element { scale: 18 symbol { name: "charging-station-l" - priority: 16585 + priority: 16643 } caption { primary { @@ -3129,14 +3129,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15585 + priority: 15643 } } element { scale: 19 symbol { name: "charging-station-l" - priority: 16585 + priority: 16643 } caption { primary { @@ -3144,7 +3144,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15585 + priority: 15643 } } } @@ -3154,7 +3154,7 @@ cont { scale: 17 symbol { name: "kindergarten-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -3162,14 +3162,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "kindergarten-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -3177,14 +3177,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "kindergarten-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -3192,7 +3192,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -3202,7 +3202,7 @@ cont { scale: 17 symbol { name: "cinema-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3210,14 +3210,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "cinema-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3225,14 +3225,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "cinema-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3240,7 +3240,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -3250,7 +3250,7 @@ cont { scale: 17 symbol { name: "hospital-l" - priority: 16594 + priority: 16653 min_distance: 4 } caption { @@ -3259,14 +3259,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "hospital-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3274,14 +3274,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "hospital-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3289,7 +3289,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -3299,7 +3299,7 @@ cont { scale: 17 symbol { name: "college-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3307,14 +3307,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "college-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3322,14 +3322,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "college-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3337,7 +3337,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -3347,7 +3347,7 @@ cont { scale: 14 symbol { name: "tourism-s" - priority: 16846 + priority: 16831 min_distance: 8 } caption { @@ -3356,14 +3356,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15846 + priority: 15831 } } element { scale: 15 symbol { name: "tourism-m" - priority: 16846 + priority: 16831 min_distance: 24 } caption { @@ -3372,14 +3372,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15846 + priority: 15831 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16846 + priority: 16831 min_distance: 16 } caption { @@ -3388,7 +3388,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15846 + priority: 15831 } } element { @@ -3399,7 +3399,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15846 + priority: 15831 } } element { @@ -3410,7 +3410,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15846 + priority: 15831 } } element { @@ -3421,7 +3421,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15846 + priority: 15831 } } } @@ -3431,7 +3431,7 @@ cont { scale: 17 symbol { name: "public-building-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3439,14 +3439,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "public-building-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3454,14 +3454,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "public-building-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3469,7 +3469,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -3479,7 +3479,7 @@ cont { scale: 17 symbol { name: "dentist-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -3487,14 +3487,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "dentist-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -3502,14 +3502,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "dentist-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -3517,7 +3517,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -3527,32 +3527,32 @@ cont { scale: 14 area { color: 16308697 - priority: -15406 + priority: -15347 } } element { scale: 15 area { color: 16308697 - priority: -15406 + priority: -15347 } } element { scale: 16 area { color: 16308697 - priority: -15406 + priority: -15347 } } element { scale: 17 area { color: 16308697 - priority: -15406 + priority: -15347 } symbol { name: "hospital-l" - priority: 16594 + priority: 16653 min_distance: 4 } caption { @@ -3561,18 +3561,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 area { color: 16308697 - priority: -15406 + priority: -15347 } symbol { name: "hospital-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3580,18 +3580,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 area { color: 16308697 - priority: -15406 + priority: -15347 } symbol { name: "hospital-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3599,7 +3599,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -3609,7 +3609,7 @@ cont { scale: 15 symbol { name: "drinking-water-m" - priority: 16522 + priority: 16574 min_distance: 36 } } @@ -3617,7 +3617,7 @@ cont { scale: 16 symbol { name: "drinking-water-m" - priority: 16522 + priority: 16574 min_distance: 36 } } @@ -3625,21 +3625,21 @@ cont { scale: 17 symbol { name: "drinking-water-l" - priority: 16522 + priority: 16574 } } element { scale: 18 symbol { name: "drinking-water-l" - priority: 16522 + priority: 16574 } } element { scale: 19 symbol { name: "drinking-water-l" - priority: 16522 + priority: 16574 } caption { primary { @@ -3647,7 +3647,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15522 + priority: 15574 } } } @@ -3657,7 +3657,7 @@ cont { scale: 17 symbol { name: "embassy-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3665,14 +3665,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "embassy-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3680,14 +3680,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "embassy-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3695,7 +3695,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -3705,7 +3705,7 @@ cont { scale: 15 symbol { name: "fastfood-m" - priority: 16630 + priority: 16693 min_distance: 28 } caption { @@ -3714,14 +3714,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15630 + priority: 15693 } } element { scale: 16 symbol { name: "fastfood-m" - priority: 16630 + priority: 16693 min_distance: 12 } caption { @@ -3730,14 +3730,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15630 + priority: 15693 } } element { scale: 17 symbol { name: "fastfood-l" - priority: 16630 + priority: 16693 min_distance: 12 } caption { @@ -3746,14 +3746,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15630 + priority: 15693 } } element { scale: 18 symbol { name: "fastfood-l" - priority: 16630 + priority: 16693 } caption { primary { @@ -3761,14 +3761,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15630 + priority: 15693 } } element { scale: 19 symbol { name: "fastfood-l" - priority: 16630 + priority: 16693 } caption { primary { @@ -3776,7 +3776,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15630 + priority: 15693 } } } @@ -3787,7 +3787,7 @@ cont { symbol { name: "ship-s" apply_for_type: 1 - priority: 16603 + priority: 16663 min_distance: 12 } } @@ -3796,7 +3796,7 @@ cont { symbol { name: "ship-s" apply_for_type: 1 - priority: 16603 + priority: 16663 min_distance: 12 } } @@ -3805,7 +3805,7 @@ cont { symbol { name: "ship-s" apply_for_type: 1 - priority: 16603 + priority: 16663 } } element { @@ -3813,7 +3813,7 @@ cont { symbol { name: "ship-s" apply_for_type: 1 - priority: 16603 + priority: 16663 } } element { @@ -3821,7 +3821,7 @@ cont { symbol { name: "ship-m" apply_for_type: 1 - priority: 16603 + priority: 16663 } } element { @@ -3829,7 +3829,7 @@ cont { symbol { name: "ship-m" apply_for_type: 1 - priority: 16603 + priority: 16663 } caption { primary { @@ -3838,7 +3838,7 @@ cont { stroke_color: 872415231 offset_y: 8 } - priority: 15603 + priority: 15663 } } element { @@ -3846,7 +3846,7 @@ cont { symbol { name: "ship-l" apply_for_type: 1 - priority: 16603 + priority: 16663 } caption { primary { @@ -3855,7 +3855,7 @@ cont { stroke_color: 1308622847 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { @@ -3863,7 +3863,7 @@ cont { symbol { name: "ship-l" apply_for_type: 1 - priority: 16603 + priority: 16663 } caption { primary { @@ -3872,7 +3872,7 @@ cont { stroke_color: 1308622847 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { @@ -3880,7 +3880,7 @@ cont { symbol { name: "ship-l" apply_for_type: 1 - priority: 16603 + priority: 16663 } caption { primary { @@ -3889,7 +3889,7 @@ cont { stroke_color: 1308622847 offset_y: 10 } - priority: 15603 + priority: 15663 } } } @@ -3899,7 +3899,7 @@ cont { scale: 18 symbol { name: "fire_station-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -3907,14 +3907,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "fire_station-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -3922,7 +3922,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -3932,11 +3932,11 @@ cont { scale: 16 area { color: 9163744 - priority: -15487 + priority: -15436 } symbol { name: "fountain-m" - priority: 16513 + priority: 16564 min_distance: 20 } caption { @@ -3945,18 +3945,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15513 + priority: 15564 } } element { scale: 17 area { color: 9163744 - priority: -15487 + priority: -15436 } symbol { name: "fountain-l" - priority: 16513 + priority: 16564 min_distance: 24 } caption { @@ -3965,18 +3965,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15513 + priority: 15564 } } element { scale: 18 area { color: 9163744 - priority: -15487 + priority: -15436 } symbol { name: "fountain-l" - priority: 16513 + priority: 16564 min_distance: 24 } caption { @@ -3985,18 +3985,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15513 + priority: 15564 } } element { scale: 19 area { color: 9163744 - priority: -15487 + priority: -15436 } symbol { name: "fountain-l" - priority: 16513 + priority: 16564 min_distance: 24 } caption { @@ -4005,7 +4005,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15513 + priority: 15564 } } } @@ -4015,7 +4015,7 @@ cont { scale: 12 symbol { name: "fuel-s" - priority: 16585 + priority: 16643 min_distance: 20 } caption { @@ -4031,7 +4031,7 @@ cont { scale: 13 symbol { name: "fuel-s" - priority: 16585 + priority: 16643 min_distance: 20 } caption { @@ -4047,7 +4047,7 @@ cont { scale: 14 symbol { name: "fuel-s" - priority: 16585 + priority: 16643 min_distance: 20 } caption { @@ -4063,7 +4063,7 @@ cont { scale: 15 symbol { name: "fuel-m" - priority: 16585 + priority: 16643 min_distance: 20 } caption { @@ -4079,7 +4079,7 @@ cont { scale: 16 symbol { name: "fuel-m" - priority: 16585 + priority: 16643 min_distance: 10 } caption { @@ -4095,7 +4095,7 @@ cont { scale: 17 symbol { name: "fuel-l" - priority: 16585 + priority: 16643 } caption { primary { @@ -4103,14 +4103,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15585 + priority: 15643 } } element { scale: 18 symbol { name: "fuel-l" - priority: 16585 + priority: 16643 } caption { primary { @@ -4118,14 +4118,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15585 + priority: 15643 } } element { scale: 19 symbol { name: "fuel-l" - priority: 16585 + priority: 16643 } caption { primary { @@ -4133,7 +4133,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15585 + priority: 15643 } } } @@ -4143,32 +4143,32 @@ cont { scale: 14 area { color: 666683518 - priority: -15640 + priority: -15604 } } element { scale: 15 area { color: 12372094 - priority: -15640 + priority: -15604 } } element { scale: 16 area { color: 11781233 - priority: -15640 + priority: -15604 } } element { scale: 17 area { color: 11781233 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -4176,18 +4176,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 18 area { color: 11781233 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -4195,18 +4195,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 19 area { color: 11781233 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -4214,7 +4214,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } } @@ -4224,32 +4224,32 @@ cont { scale: 14 area { color: 666683518 - priority: -15640 + priority: -15604 } } element { scale: 15 area { color: 12372094 - priority: -15640 + priority: -15604 } } element { scale: 16 area { color: 11781233 - priority: -15640 + priority: -15604 } } element { scale: 17 area { color: 11781233 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -4257,18 +4257,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 18 area { color: 11781233 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -4276,18 +4276,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 19 area { color: 11781233 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -4295,7 +4295,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } } @@ -4305,11 +4305,11 @@ cont { scale: 14 area { color: 16308697 - priority: -15082 + priority: -15090 } symbol { name: "hospital-s" - priority: 16918 + priority: 16910 min_distance: 8 } } @@ -4317,12 +4317,12 @@ cont { scale: 15 area { color: 16308697 - priority: -15082 + priority: -15090 } symbol { name: "hospital-m" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 6 } caption { @@ -4331,19 +4331,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15918 + priority: 15910 } } element { scale: 16 area { color: 16308697 - priority: -15082 + priority: -15090 } symbol { name: "hospital-m" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 4 } caption { @@ -4352,19 +4352,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15918 + priority: 15910 } } element { scale: 17 area { color: 16308697 - priority: -15082 + priority: -15090 } symbol { name: "hospital-l" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 4 } caption { @@ -4373,19 +4373,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15918 + priority: 15910 } } element { scale: 18 area { color: 16308697 - priority: -15082 + priority: -15090 } symbol { name: "hospital-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -4393,19 +4393,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15918 + priority: 15910 } } element { scale: 19 area { color: 16308697 - priority: -15082 + priority: -15090 } symbol { name: "hospital-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -4413,7 +4413,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15918 + priority: 15910 } } } @@ -4423,7 +4423,7 @@ cont { scale: 18 symbol { name: "hunting-tower-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -4431,14 +4431,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "hunting-tower-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -4446,7 +4446,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -4456,7 +4456,7 @@ cont { scale: 17 symbol { name: "kindergarten-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -4464,14 +4464,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "kindergarten-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -4479,14 +4479,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "kindergarten-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -4494,7 +4494,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -4505,7 +4505,7 @@ cont { symbol { name: "library-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } caption { primary { @@ -4513,7 +4513,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { @@ -4521,7 +4521,7 @@ cont { symbol { name: "library-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } caption { primary { @@ -4529,7 +4529,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -4539,7 +4539,7 @@ cont { scale: 16 symbol { name: "marketplace-m" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -4548,14 +4548,14 @@ cont { color: 4473924 offset_y: 11 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "marketplace-l" - priority: 16540 + priority: 16594 min_distance: 8 } caption { @@ -4564,14 +4564,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "marketplace-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -4579,14 +4579,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "marketplace-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -4594,7 +4594,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -4604,7 +4604,7 @@ cont { scale: 16 symbol { name: "bar-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -4612,14 +4612,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 17 symbol { name: "bar-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -4627,14 +4627,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 18 symbol { name: "bar-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -4642,14 +4642,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "bar-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -4657,7 +4657,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -4667,18 +4667,18 @@ cont { scale: 15 area { color: 15921870 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-s" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -4686,22 +4686,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -4709,18 +4709,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -4728,7 +4728,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -4738,18 +4738,18 @@ cont { scale: 15 area { color: 15921870 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-s" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -4757,22 +4757,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -4780,18 +4780,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -4799,7 +4799,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -4809,18 +4809,18 @@ cont { scale: 15 area { color: 15921870 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-s" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -4828,22 +4828,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -4851,18 +4851,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -4870,7 +4870,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -4880,18 +4880,18 @@ cont { scale: 15 area { color: 15921870 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-s" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -4899,22 +4899,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -4922,18 +4922,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -4941,7 +4941,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -4951,18 +4951,18 @@ cont { scale: 15 area { color: 15921870 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-s" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -4970,22 +4970,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -4993,18 +4993,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5012,7 +5012,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -5022,18 +5022,18 @@ cont { scale: 15 area { color: 15921870 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-s" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -5041,22 +5041,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5064,18 +5064,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5083,7 +5083,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -5093,18 +5093,18 @@ cont { scale: 15 area { color: 15921870 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "zero-icon" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -5112,22 +5112,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "zero-icon" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5135,18 +5135,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5154,7 +5154,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -5164,18 +5164,18 @@ cont { scale: 15 area { color: 15921870 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "zero-icon" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -5183,22 +5183,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "zero-icon" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5206,18 +5206,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5225,7 +5225,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -5235,18 +5235,18 @@ cont { scale: 15 area { color: 15921870 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "zero-icon" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -5254,22 +5254,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "zero-icon" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5277,18 +5277,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5296,7 +5296,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -5306,18 +5306,18 @@ cont { scale: 15 area { color: 15921870 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-s" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -5325,22 +5325,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5348,18 +5348,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5367,7 +5367,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -5377,18 +5377,18 @@ cont { scale: 15 area { color: 15921870 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-s" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -5396,22 +5396,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5419,18 +5419,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5438,7 +5438,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -5448,7 +5448,7 @@ cont { scale: 16 symbol { name: "pharmacy-m" - priority: 16918 + priority: 16910 min_distance: 20 } } @@ -5456,7 +5456,7 @@ cont { scale: 17 symbol { name: "pharmacy-l" - priority: 16918 + priority: 16910 min_distance: 20 } caption { @@ -5465,14 +5465,14 @@ cont { color: 4473924 offset_y: 8 } - priority: 15918 + priority: 15910 } } element { scale: 18 symbol { name: "pharmacy-l" - priority: 16918 + priority: 16910 } caption { primary { @@ -5480,14 +5480,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15918 + priority: 15910 } } element { scale: 19 symbol { name: "pharmacy-l" - priority: 16918 + priority: 16910 } caption { primary { @@ -5495,7 +5495,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15918 + priority: 15910 } } } @@ -5505,7 +5505,7 @@ cont { scale: 14 symbol { name: "place-of-worship-s" - priority: 16855 + priority: 16841 min_distance: 12 } caption { @@ -5514,14 +5514,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15855 + priority: 15841 } } element { scale: 15 symbol { name: "place-of-worship-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5530,18 +5530,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 16 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "place-of-worship-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5550,18 +5550,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 17 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "place-of-worship-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5569,18 +5569,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 18 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "place-of-worship-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5588,18 +5588,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 19 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "place-of-worship-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5607,7 +5607,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } } @@ -5617,7 +5617,7 @@ cont { scale: 14 symbol { name: "buddhist-s" - priority: 16855 + priority: 16841 min_distance: 12 } caption { @@ -5626,14 +5626,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15855 + priority: 15841 } } element { scale: 15 symbol { name: "buddhist-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5642,18 +5642,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 16 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "buddhist-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5662,18 +5662,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 17 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "buddhist-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5681,18 +5681,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 18 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "buddhist-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5700,18 +5700,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 19 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "buddhist-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5719,7 +5719,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } } @@ -5729,7 +5729,7 @@ cont { scale: 14 symbol { name: "christian-s" - priority: 16855 + priority: 16841 min_distance: 12 } caption { @@ -5738,14 +5738,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15855 + priority: 15841 } } element { scale: 15 symbol { name: "christian-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5754,18 +5754,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 16 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "christian-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5774,18 +5774,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 17 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "christian-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5793,18 +5793,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 18 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "christian-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5812,18 +5812,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 19 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "christian-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5831,7 +5831,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } } @@ -5841,7 +5841,7 @@ cont { scale: 14 symbol { name: "hindu-s" - priority: 16855 + priority: 16841 min_distance: 12 } caption { @@ -5850,14 +5850,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15855 + priority: 15841 } } element { scale: 15 symbol { name: "hindu-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5866,18 +5866,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 16 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "hindu-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5886,18 +5886,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 17 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "hindu-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5905,18 +5905,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 18 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "hindu-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5924,18 +5924,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 19 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "hindu-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5943,7 +5943,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } } @@ -5953,7 +5953,7 @@ cont { scale: 14 symbol { name: "jewish-s" - priority: 16855 + priority: 16841 min_distance: 12 } caption { @@ -5962,14 +5962,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15855 + priority: 15841 } } element { scale: 15 symbol { name: "jewish-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5978,18 +5978,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 16 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "jewish-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5998,18 +5998,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 17 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "jewish-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6017,18 +6017,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 18 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "jewish-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6036,18 +6036,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 19 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "jewish-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6055,7 +6055,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } } @@ -6065,7 +6065,7 @@ cont { scale: 14 symbol { name: "muslim-s" - priority: 16855 + priority: 16841 min_distance: 12 } caption { @@ -6074,14 +6074,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15855 + priority: 15841 } } element { scale: 15 symbol { name: "muslim-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -6090,18 +6090,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 16 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "muslim-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -6110,18 +6110,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 17 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "muslim-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6129,18 +6129,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 18 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "muslim-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6148,18 +6148,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 19 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "muslim-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6167,7 +6167,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } } @@ -6177,7 +6177,7 @@ cont { scale: 14 symbol { name: "shinto-s" - priority: 16855 + priority: 16841 min_distance: 12 } caption { @@ -6186,14 +6186,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15855 + priority: 15841 } } element { scale: 15 symbol { name: "shinto-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -6202,18 +6202,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 16 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "shinto-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -6222,18 +6222,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 17 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "shinto-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6241,18 +6241,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 18 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "shinto-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6260,18 +6260,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 19 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "shinto-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6279,7 +6279,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } } @@ -6289,7 +6289,7 @@ cont { scale: 14 symbol { name: "taoist-s" - priority: 16855 + priority: 16841 min_distance: 12 } caption { @@ -6298,14 +6298,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15855 + priority: 15841 } } element { scale: 15 symbol { name: "taoist-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -6314,18 +6314,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 16 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "taoist-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -6334,18 +6334,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 17 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "taoist-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6353,18 +6353,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 18 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "taoist-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6372,18 +6372,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 19 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "taoist-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6391,7 +6391,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } } @@ -6401,7 +6401,7 @@ cont { scale: 17 symbol { name: "police-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -6409,14 +6409,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "police-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -6424,14 +6424,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "police-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -6439,7 +6439,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -6449,7 +6449,7 @@ cont { scale: 18 symbol { name: "postbox-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -6457,14 +6457,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "postbox-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -6472,7 +6472,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -6483,7 +6483,7 @@ cont { symbol { name: "mail-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -6491,7 +6491,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -6499,7 +6499,7 @@ cont { symbol { name: "mail-m" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -6507,7 +6507,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -6515,7 +6515,7 @@ cont { symbol { name: "mail-m" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -6523,7 +6523,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -6533,7 +6533,7 @@ cont { scale: 15 symbol { name: "beer-m" - priority: 16612 + priority: 16673 min_distance: 28 } caption { @@ -6542,14 +6542,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15612 + priority: 15673 } } element { scale: 16 symbol { name: "beer-m" - priority: 16612 + priority: 16673 min_distance: 12 } caption { @@ -6558,14 +6558,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15612 + priority: 15673 } } element { scale: 17 symbol { name: "beer-l" - priority: 16612 + priority: 16673 min_distance: 12 } caption { @@ -6574,14 +6574,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15612 + priority: 15673 } } element { scale: 18 symbol { name: "beer-l" - priority: 16612 + priority: 16673 } caption { primary { @@ -6589,14 +6589,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15612 + priority: 15673 } } element { scale: 19 symbol { name: "beer-l" - priority: 16612 + priority: 16673 } caption { primary { @@ -6604,7 +6604,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15612 + priority: 15673 } } } @@ -6628,7 +6628,7 @@ cont { scale: 17 symbol { name: "recycling-l" - priority: 16531 + priority: 16584 min_distance: 30 } } @@ -6636,7 +6636,7 @@ cont { scale: 18 symbol { name: "recycling-l" - priority: 16531 + priority: 16584 min_distance: 30 } } @@ -6644,7 +6644,7 @@ cont { scale: 19 symbol { name: "recycling-l" - priority: 16531 + priority: 16584 min_distance: 30 } caption { @@ -6653,7 +6653,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -6663,7 +6663,7 @@ cont { scale: 15 symbol { name: "restaurant-m" - priority: 16639 + priority: 16702 min_distance: 28 } caption { @@ -6672,14 +6672,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15639 + priority: 15702 } } element { scale: 16 symbol { name: "restaurant-m" - priority: 16639 + priority: 16702 min_distance: 12 } caption { @@ -6688,14 +6688,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15639 + priority: 15702 } } element { scale: 17 symbol { name: "restaurant-l" - priority: 16639 + priority: 16702 min_distance: 12 } caption { @@ -6704,14 +6704,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15639 + priority: 15702 } } element { scale: 18 symbol { name: "restaurant-l" - priority: 16639 + priority: 16702 } caption { primary { @@ -6719,14 +6719,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15639 + priority: 15702 } } element { scale: 19 symbol { name: "restaurant-l" - priority: 16639 + priority: 16702 } caption { primary { @@ -6734,7 +6734,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15639 + priority: 15702 } } } @@ -6744,7 +6744,7 @@ cont { scale: 17 symbol { name: "school-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -6752,14 +6752,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 18 symbol { name: "school-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -6767,14 +6767,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "school-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -6782,7 +6782,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -6792,7 +6792,7 @@ cont { scale: 16 symbol { name: "picnic-m" - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -6801,14 +6801,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 17 symbol { name: "picnic-l" - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -6817,14 +6817,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 18 symbol { name: "picnic-l" - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -6833,14 +6833,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "picnic-l" - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -6849,7 +6849,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -6873,7 +6873,7 @@ cont { scale: 16 symbol { name: "taxi-m" - priority: 16540 + priority: 16594 min_distance: 30 } caption { @@ -6882,14 +6882,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "taxi-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -6898,14 +6898,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "taxi-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -6913,14 +6913,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "taxi-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -6928,7 +6928,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -6939,7 +6939,7 @@ cont { symbol { name: "phone-l" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 30 } } @@ -6948,7 +6948,7 @@ cont { symbol { name: "phone-l" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 30 } } @@ -6957,7 +6957,7 @@ cont { symbol { name: "phone-l" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 30 } caption { @@ -6966,7 +6966,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -6976,7 +6976,7 @@ cont { scale: 14 symbol { name: "theatre-s" - priority: 16648 + priority: 16712 min_distance: 8 } caption { @@ -6985,7 +6985,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15648 + priority: 15712 } } element { @@ -6996,14 +6996,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15648 + priority: 15712 } } element { scale: 16 symbol { name: "theatre-m" - priority: 16648 + priority: 16712 min_distance: 10 } caption { @@ -7012,14 +7012,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15648 + priority: 15712 } } element { scale: 17 symbol { name: "theatre-l" - priority: 16648 + priority: 16712 } caption { primary { @@ -7027,14 +7027,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15648 + priority: 15712 } } element { scale: 18 symbol { name: "theatre-l" - priority: 16648 + priority: 16712 } caption { primary { @@ -7042,14 +7042,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15648 + priority: 15712 } } element { scale: 19 symbol { name: "theatre-l" - priority: 16648 + priority: 16712 } caption { primary { @@ -7057,7 +7057,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15648 + priority: 15712 } } } @@ -7067,7 +7067,7 @@ cont { scale: 18 symbol { name: "toilets-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -7075,14 +7075,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "toilets-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -7090,7 +7090,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -7321,7 +7321,7 @@ cont { scale: 17 symbol { name: "vending-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7330,14 +7330,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "vending-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7346,14 +7346,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "vending-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7362,7 +7362,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -7372,7 +7372,7 @@ cont { scale: 17 symbol { name: "vending-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7381,14 +7381,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "vending-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7397,14 +7397,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "vending-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7413,7 +7413,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -7423,7 +7423,7 @@ cont { scale: 17 symbol { name: "parking-meter-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7432,14 +7432,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "parking-meter-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7448,14 +7448,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "parking-meter-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7464,7 +7464,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -7474,7 +7474,7 @@ cont { scale: 17 symbol { name: "vending-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7483,14 +7483,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "vending-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7499,14 +7499,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "vending-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7515,7 +7515,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -7525,7 +7525,7 @@ cont { scale: 16 symbol { name: "veterinary-m" - priority: 16540 + priority: 16594 } caption { primary { @@ -7533,14 +7533,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "veterinary-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -7548,14 +7548,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "veterinary-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -7563,14 +7563,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "veterinary-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -7578,7 +7578,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -7589,7 +7589,7 @@ cont { symbol { name: "waste-basket-s" apply_for_type: 1 - priority: 16522 + priority: 16574 } } element { @@ -7597,7 +7597,7 @@ cont { symbol { name: "waste-basket-s" apply_for_type: 1 - priority: 16522 + priority: 16574 } caption { primary { @@ -7605,7 +7605,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15522 + priority: 15574 } } } @@ -7615,7 +7615,7 @@ cont { scale: 18 symbol { name: "recycling-l" - priority: 16522 + priority: 16574 } caption { primary { @@ -7623,14 +7623,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15522 + priority: 15574 } } element { scale: 19 symbol { name: "recycling-l" - priority: 16522 + priority: 16574 } caption { primary { @@ -7638,7 +7638,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15522 + priority: 15574 } } } @@ -7648,77 +7648,77 @@ cont { scale: 14 area { color: 15591638 - priority: -15883 + priority: -15872 } } element { scale: 15 area { color: 15591638 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 6710886 } - priority: 15117 + priority: 15128 } } element { scale: 16 area { color: 15920858 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 6710886 } - priority: 15117 + priority: 15128 } } element { scale: 17 area { color: 15920858 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 6710886 } - priority: 15117 + priority: 15128 } } element { scale: 18 area { color: 15920858 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 6710886 } - priority: 15117 + priority: 15128 } } element { scale: 19 area { color: 15920858 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 6710886 } - priority: 15117 + priority: 15128 } } } @@ -7728,42 +7728,42 @@ cont { scale: 14 area { color: 15591638 - priority: -15883 + priority: -15872 } } element { scale: 15 area { color: 15591638 - priority: -15883 + priority: -15872 } } element { scale: 16 area { color: 15920858 - priority: -15883 + priority: -15872 } } element { scale: 17 area { color: 15920858 - priority: -15883 + priority: -15872 } } element { scale: 18 area { color: 15920858 - priority: -15883 + priority: -15872 } } element { scale: 19 area { color: 15920858 - priority: -15883 + priority: -15872 } } } @@ -7773,77 +7773,77 @@ cont { scale: 14 area { color: 15591638 - priority: -15883 + priority: -15872 } } element { scale: 15 area { color: 15591638 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 6710886 } - priority: 15117 + priority: 15128 } } element { scale: 16 area { color: 15920858 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 6710886 } - priority: 15117 + priority: 15128 } } element { scale: 17 area { color: 15920858 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 6710886 } - priority: 15117 + priority: 15128 } } element { scale: 18 area { color: 15920858 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 6710886 } - priority: 15117 + priority: 15128 } } element { scale: 19 area { color: 15920858 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 6710886 } - priority: 15117 + priority: 15128 } } } @@ -7980,7 +7980,7 @@ cont { symbol { name: "bcontrol-m" apply_for_type: 1 - priority: 16603 + priority: 16663 } caption { primary { @@ -7988,7 +7988,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { @@ -7996,7 +7996,7 @@ cont { symbol { name: "bcontrol-m" apply_for_type: 1 - priority: 16603 + priority: 16663 } caption { primary { @@ -8004,7 +8004,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { @@ -8012,7 +8012,7 @@ cont { symbol { name: "bcontrol-l" apply_for_type: 1 - priority: 16603 + priority: 16663 } caption { primary { @@ -8020,7 +8020,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { @@ -8028,7 +8028,7 @@ cont { symbol { name: "bcontrol-l" apply_for_type: 1 - priority: 16603 + priority: 16663 } caption { primary { @@ -8036,7 +8036,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { @@ -8044,7 +8044,7 @@ cont { symbol { name: "bcontrol-l" apply_for_type: 1 - priority: 16603 + priority: 16663 } caption { primary { @@ -8052,7 +8052,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15603 + priority: 15663 } } } @@ -8067,7 +8067,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8081,7 +8081,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8095,7 +8095,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8109,7 +8109,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8189,7 +8189,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8203,7 +8203,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8217,7 +8217,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8231,7 +8231,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8311,7 +8311,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8325,7 +8325,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8339,7 +8339,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8353,7 +8353,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8365,7 +8365,7 @@ cont { scale: 16 symbol { name: "lift_gate-m" - priority: 16540 + priority: 16594 min_distance: 30 } caption { @@ -8374,14 +8374,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "lift_gate-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -8390,14 +8390,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "lift_gate-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -8406,14 +8406,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "lift_gate-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -8422,7 +8422,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -8437,7 +8437,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8451,7 +8451,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8465,7 +8465,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8479,7 +8479,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8554,7 +8554,7 @@ cont { scale: 12 symbol { name: "toll_booth-s" - priority: 16927 + priority: 16920 min_distance: 8 } } @@ -8562,7 +8562,7 @@ cont { scale: 13 symbol { name: "toll_booth-s" - priority: 16927 + priority: 16920 min_distance: 8 } } @@ -8570,7 +8570,7 @@ cont { scale: 14 symbol { name: "toll_booth-s" - priority: 16927 + priority: 16920 min_distance: 8 } caption { @@ -8579,14 +8579,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15927 + priority: 15920 } } element { scale: 15 symbol { name: "toll_booth-m" - priority: 16927 + priority: 16920 min_distance: 8 } caption { @@ -8595,14 +8595,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15927 + priority: 15920 } } element { scale: 16 symbol { name: "toll_booth-m" - priority: 16927 + priority: 16920 min_distance: 8 } caption { @@ -8611,14 +8611,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15927 + priority: 15920 } } element { scale: 17 symbol { name: "toll_booth-m" - priority: 16927 + priority: 16920 min_distance: 8 } caption { @@ -8627,14 +8627,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15927 + priority: 15920 } } element { scale: 18 symbol { name: "toll_booth-m" - priority: 16927 + priority: 16920 min_distance: 8 } caption { @@ -8643,14 +8643,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15927 + priority: 15920 } } element { scale: 19 symbol { name: "toll_booth-m" - priority: 16927 + priority: 16920 min_distance: 8 } caption { @@ -8659,7 +8659,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15927 + priority: 15920 } } } @@ -8674,7 +8674,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8688,7 +8688,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8702,7 +8702,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8716,7 +8716,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8729,7 +8729,7 @@ cont { lines { width: 0.5 color: 1298359132 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8739,7 +8739,7 @@ cont { lines { width: 0.5 color: 862151516 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8749,7 +8749,7 @@ cont { lines { width: 0.6 color: 6513500 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8759,7 +8759,7 @@ cont { lines { width: 0.8 color: 6513500 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8769,7 +8769,7 @@ cont { lines { width: 0.85 color: 6513500 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8779,7 +8779,7 @@ cont { lines { width: 1.0 color: 6513500 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8789,7 +8789,7 @@ cont { lines { width: 1.1 color: 6513500 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8799,7 +8799,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8809,7 +8809,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8819,7 +8819,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8829,7 +8829,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8839,7 +8839,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: BUTTCAP } @@ -8849,7 +8849,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: BUTTCAP } @@ -8859,7 +8859,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: BUTTCAP } @@ -8869,7 +8869,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -8879,7 +8879,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -8889,7 +8889,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -8899,7 +8899,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -8916,7 +8916,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8933,7 +8933,7 @@ cont { dd: 1.35 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8947,7 +8947,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8961,7 +8961,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8975,7 +8975,7 @@ cont { dd: 1.44 dd: 1.44 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8989,7 +8989,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9003,7 +9003,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9017,7 +9017,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9031,7 +9031,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9045,7 +9045,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: BUTTCAP } @@ -9059,7 +9059,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: BUTTCAP } @@ -9073,7 +9073,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: BUTTCAP } @@ -9087,7 +9087,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -9101,7 +9101,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -9115,7 +9115,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -9129,7 +9129,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -9146,7 +9146,7 @@ cont { dd: 1.35 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9160,7 +9160,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9174,7 +9174,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9188,7 +9188,7 @@ cont { dd: 1.44 dd: 1.44 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9202,7 +9202,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9216,7 +9216,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9230,7 +9230,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9244,7 +9244,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9258,7 +9258,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: BUTTCAP } @@ -9272,7 +9272,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: BUTTCAP } @@ -9286,7 +9286,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: BUTTCAP } @@ -9300,7 +9300,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -9314,7 +9314,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -9328,7 +9328,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -9342,7 +9342,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -9354,7 +9354,7 @@ cont { scale: 11 symbol { name: "nparkf-s" - priority: 16603 + priority: 16663 min_distance: 20 } } @@ -9362,7 +9362,7 @@ cont { scale: 12 symbol { name: "nparkf-s" - priority: 16603 + priority: 16663 min_distance: 12 } caption { @@ -9372,14 +9372,14 @@ cont { stroke_color: 872415231 offset_y: 6 } - priority: 15603 + priority: 15663 } } element { scale: 13 symbol { name: "nparkf-s" - priority: 16603 + priority: 16663 min_distance: 12 } caption { @@ -9389,18 +9389,18 @@ cont { stroke_color: 872415231 offset_y: 6 } - priority: 15603 + priority: 15663 } } element { scale: 14 area { color: 10400608 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-s" - priority: 16603 + priority: 16663 } caption { primary { @@ -9409,18 +9409,18 @@ cont { stroke_color: 872415231 offset_y: 8 } - priority: 15603 + priority: 15663 } } element { scale: 15 area { color: 10400608 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-m" - priority: 16603 + priority: 16663 } caption { primary { @@ -9429,18 +9429,18 @@ cont { stroke_color: 452984831 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 16 area { color: 10400608 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-m" - priority: 16603 + priority: 16663 } caption { primary { @@ -9449,18 +9449,18 @@ cont { stroke_color: 452984831 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 17 area { color: 10400608 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -9469,18 +9469,18 @@ cont { stroke_color: 452984831 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 18 area { color: 10400608 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -9489,18 +9489,18 @@ cont { stroke_color: 452984831 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 19 area { color: 10400608 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -9509,7 +9509,7 @@ cont { stroke_color: 452984831 offset_y: 10 } - priority: 15603 + priority: 15663 } } } @@ -9519,14 +9519,14 @@ cont { scale: 14 area { color: 2160707771 - priority: 1235 + priority: 1258 } } element { scale: 15 area { color: 1724500155 - priority: 1235 + priority: 1258 } } element { @@ -9537,7 +9537,7 @@ cont { width: 1.0 color: 10592406 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9550,7 +9550,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9561,7 +9561,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9574,7 +9574,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9585,7 +9585,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9598,7 +9598,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9609,7 +9609,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9622,7 +9622,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } } @@ -9641,7 +9641,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9657,7 +9657,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9673,7 +9673,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9689,7 +9689,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } } @@ -9699,14 +9699,14 @@ cont { scale: 14 area { color: 2160707771 - priority: 1235 + priority: 1258 } } element { scale: 15 area { color: 1724500155 - priority: 1235 + priority: 1258 } } element { @@ -9717,7 +9717,7 @@ cont { width: 1.0 color: 10592406 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9730,7 +9730,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9741,7 +9741,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9754,7 +9754,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9765,7 +9765,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9778,7 +9778,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9789,7 +9789,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9802,7 +9802,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } } @@ -9812,14 +9812,14 @@ cont { scale: 14 area { color: 2160707771 - priority: 1235 + priority: 1258 } } element { scale: 15 area { color: 1724500155 - priority: 1235 + priority: 1258 } } element { @@ -9830,7 +9830,7 @@ cont { width: 1.0 color: 10592406 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9843,7 +9843,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9854,7 +9854,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9867,7 +9867,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9878,7 +9878,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9891,7 +9891,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9902,7 +9902,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9915,7 +9915,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } } @@ -9925,43 +9925,43 @@ cont { scale: 11 symbol { name: "train-s" - priority: 16657 + priority: 16722 } } element { scale: 12 symbol { name: "train-s" - priority: 16657 + priority: 16722 } } element { scale: 13 symbol { name: "train-s" - priority: 16657 + priority: 16722 } } element { scale: 14 area { color: 2160707771 - priority: 1658 + priority: 1723 } symbol { name: "train-s" - priority: 16657 + priority: 16722 } } element { scale: 15 area { color: 1724500155 - priority: 1658 + priority: 1723 } symbol { name: "train-m" - priority: 16657 + priority: 16722 } } element { @@ -9972,11 +9972,11 @@ cont { width: 1.0 color: 10592406 } - priority: 1235 + priority: 1258 } symbol { name: "train-m" - priority: 16234 + priority: 16257 } caption { primary { @@ -9990,7 +9990,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -10001,11 +10001,11 @@ cont { width: 1.0 color: 10197647 } - priority: 1235 + priority: 1258 } symbol { name: "train-l" - priority: 16234 + priority: 16257 } caption { primary { @@ -10019,7 +10019,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -10030,11 +10030,11 @@ cont { width: 1.0 color: 10197647 } - priority: 1235 + priority: 1258 } symbol { name: "train-l" - priority: 16234 + priority: 16257 } caption { primary { @@ -10048,7 +10048,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -10059,11 +10059,11 @@ cont { width: 1.0 color: 10197647 } - priority: 1235 + priority: 1258 } symbol { name: "train-l" - priority: 16234 + priority: 16257 } caption { primary { @@ -10077,7 +10077,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } } @@ -10091,7 +10091,7 @@ cont { width: 1.0 color: 10592406 } - priority: 1199 + priority: 1218 } } element { @@ -10102,7 +10102,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1199 + priority: 1218 } } element { @@ -10113,7 +10113,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1199 + priority: 1218 } } element { @@ -10124,7 +10124,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1199 + priority: 1218 } } } @@ -10134,7 +10134,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10142,14 +10142,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10157,7 +10157,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10167,7 +10167,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10175,14 +10175,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10190,7 +10190,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10200,7 +10200,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10208,14 +10208,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10223,7 +10223,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10233,7 +10233,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10241,14 +10241,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10256,7 +10256,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10266,7 +10266,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10274,14 +10274,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10289,7 +10289,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10299,7 +10299,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10307,14 +10307,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10322,7 +10322,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10332,7 +10332,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10340,14 +10340,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10355,7 +10355,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10365,7 +10365,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10373,14 +10373,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10388,7 +10388,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10398,7 +10398,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10406,14 +10406,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10421,7 +10421,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10431,7 +10431,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10439,14 +10439,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10454,7 +10454,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10464,7 +10464,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10472,14 +10472,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10487,7 +10487,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10498,7 +10498,7 @@ cont { symbol { name: "phone-l" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 30 } } @@ -10507,7 +10507,7 @@ cont { symbol { name: "phone-l" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 30 } } @@ -10516,7 +10516,7 @@ cont { symbol { name: "phone-l" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 30 } } @@ -10528,7 +10528,7 @@ cont { symbol { name: "entrance-s" apply_for_type: 1 - priority: 16054 + priority: 16059 } caption { primary { @@ -10537,7 +10537,7 @@ cont { offset_x: 10 text: "ref" } - priority: 15054 + priority: 15059 } } element { @@ -10545,7 +10545,7 @@ cont { symbol { name: "entrance-s" apply_for_type: 1 - priority: 16054 + priority: 16059 } caption { primary { @@ -10560,7 +10560,7 @@ cont { offset_y: 10 text: "addr:flats" } - priority: 15054 + priority: 15059 } } } @@ -10575,7 +10575,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: BUTTCAP } @@ -10589,7 +10589,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: BUTTCAP } @@ -10599,7 +10599,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -10611,7 +10611,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10621,7 +10621,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -10633,7 +10633,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10643,7 +10643,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -10655,7 +10655,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10665,7 +10665,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -10677,7 +10677,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10687,7 +10687,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } } @@ -10702,7 +10702,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: BUTTCAP } @@ -10716,7 +10716,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: BUTTCAP } @@ -10726,7 +10726,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -10738,7 +10738,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10748,7 +10748,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -10760,7 +10760,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10770,7 +10770,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -10782,7 +10782,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10792,7 +10792,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -10804,7 +10804,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10814,7 +10814,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } } @@ -10829,7 +10829,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: BUTTCAP } @@ -10843,7 +10843,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: BUTTCAP } @@ -10853,7 +10853,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -10865,7 +10865,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10875,7 +10875,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -10887,7 +10887,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10897,7 +10897,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -10909,7 +10909,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10919,7 +10919,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -10931,7 +10931,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10941,7 +10941,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } } @@ -10956,7 +10956,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: BUTTCAP } @@ -10970,7 +10970,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: BUTTCAP } @@ -10980,7 +10980,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -10992,7 +10992,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -11002,7 +11002,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -11014,7 +11014,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -11024,7 +11024,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -11036,7 +11036,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -11046,7 +11046,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -11058,7 +11058,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -11068,7 +11068,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } } @@ -11078,14 +11078,14 @@ cont { scale: 16 symbol { name: "bus-m" - priority: 16945 + priority: 16940 } } element { scale: 17 symbol { name: "bus-l" - priority: 16945 + priority: 16940 } caption { primary { @@ -11101,14 +11101,14 @@ cont { offset_y: 20 text: "int_name" } - priority: 15945 + priority: 15940 } } element { scale: 18 symbol { name: "bus-l" - priority: 16945 + priority: 16940 } caption { primary { @@ -11124,14 +11124,14 @@ cont { offset_y: 10 text: "int_name" } - priority: 15945 + priority: 15940 } } element { scale: 19 symbol { name: "bus-l" - priority: 16945 + priority: 16940 } caption { primary { @@ -11147,7 +11147,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15945 + priority: 15940 } } } @@ -11162,7 +11162,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: BUTTCAP } @@ -11176,7 +11176,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: BUTTCAP } @@ -11190,7 +11190,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: BUTTCAP } @@ -11200,7 +11200,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16261 + priority: 16287 } } element { @@ -11212,7 +11212,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -11222,7 +11222,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16261 + priority: 16287 } } element { @@ -11234,7 +11234,7 @@ cont { dd: 10.8 dd: 4.5 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -11244,7 +11244,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16261 + priority: 16287 } } element { @@ -11256,7 +11256,7 @@ cont { dd: 13.5 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -11266,7 +11266,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16261 + priority: 16287 } } element { @@ -11278,7 +11278,7 @@ cont { dd: 18.0 dd: 6.2 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -11288,7 +11288,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16261 + priority: 16287 } } } @@ -11299,7 +11299,7 @@ cont { lines { width: 1.0 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11309,7 +11309,7 @@ cont { lines { width: 1.2 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11319,7 +11319,7 @@ cont { lines { width: 1.4 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11329,7 +11329,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11337,7 +11337,7 @@ cont { lines { width: 1.6 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11347,7 +11347,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11355,7 +11355,7 @@ cont { lines { width: 1.8 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11365,7 +11365,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11373,7 +11373,7 @@ cont { lines { width: 2.0 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11383,7 +11383,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11391,7 +11391,7 @@ cont { lines { width: 2.2 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11401,7 +11401,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } } @@ -11412,7 +11412,7 @@ cont { lines { width: 1.0 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11422,7 +11422,7 @@ cont { lines { width: 1.2 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11432,7 +11432,7 @@ cont { lines { width: 1.4 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11442,7 +11442,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11450,7 +11450,7 @@ cont { lines { width: 1.6 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11460,7 +11460,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11468,7 +11468,7 @@ cont { lines { width: 1.8 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11478,7 +11478,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11486,7 +11486,7 @@ cont { lines { width: 2.0 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11496,7 +11496,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11504,7 +11504,7 @@ cont { lines { width: 2.2 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11514,7 +11514,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } } @@ -11525,7 +11525,7 @@ cont { lines { width: 1.0 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11535,7 +11535,7 @@ cont { lines { width: 1.2 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11545,7 +11545,7 @@ cont { lines { width: 1.4 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11555,7 +11555,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11563,7 +11563,7 @@ cont { lines { width: 1.6 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11573,7 +11573,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11581,7 +11581,7 @@ cont { lines { width: 1.8 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11591,7 +11591,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11599,7 +11599,7 @@ cont { lines { width: 2.0 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11609,7 +11609,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11617,7 +11617,7 @@ cont { lines { width: 2.2 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11627,7 +11627,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } } @@ -11638,7 +11638,7 @@ cont { lines { width: 1.0 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11648,7 +11648,7 @@ cont { lines { width: 1.2 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11658,7 +11658,7 @@ cont { lines { width: 1.4 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11668,7 +11668,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11676,7 +11676,7 @@ cont { lines { width: 1.6 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11686,7 +11686,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11694,7 +11694,7 @@ cont { lines { width: 1.8 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11704,7 +11704,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11712,7 +11712,7 @@ cont { lines { width: 2.0 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11722,7 +11722,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11730,7 +11730,7 @@ cont { lines { width: 2.2 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11740,7 +11740,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } } @@ -11755,7 +11755,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -11769,7 +11769,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -11779,7 +11779,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -11791,7 +11791,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -11801,7 +11801,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -11813,7 +11813,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -11823,7 +11823,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -11835,7 +11835,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -11845,7 +11845,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -11857,7 +11857,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -11867,7 +11867,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -11882,7 +11882,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -11896,7 +11896,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -11906,7 +11906,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -11918,7 +11918,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -11928,7 +11928,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -11940,7 +11940,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -11950,7 +11950,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -11962,7 +11962,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -11972,7 +11972,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -11984,7 +11984,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -11994,7 +11994,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -12009,13 +12009,13 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } area { color: 15591638 - priority: -15721 + priority: -15694 } } element { @@ -12027,13 +12027,13 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } area { color: 15591638 - priority: -15721 + priority: -15694 } path_text { primary { @@ -12041,7 +12041,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12053,13 +12053,13 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } area { color: 15920858 - priority: -15721 + priority: -15694 } path_text { primary { @@ -12067,7 +12067,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12079,13 +12079,13 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } area { color: 15920858 - priority: -15721 + priority: -15694 } path_text { primary { @@ -12093,7 +12093,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12105,13 +12105,13 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } area { color: 15920858 - priority: -15721 + priority: -15694 } path_text { primary { @@ -12119,7 +12119,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12131,13 +12131,13 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } area { color: 15920858 - priority: -15721 + priority: -15694 } path_text { primary { @@ -12145,7 +12145,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -12160,7 +12160,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12174,7 +12174,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12184,7 +12184,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12196,7 +12196,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12206,7 +12206,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12218,7 +12218,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12228,7 +12228,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12240,7 +12240,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12250,7 +12250,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12262,7 +12262,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12272,7 +12272,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -12287,7 +12287,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12301,7 +12301,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12311,7 +12311,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12323,7 +12323,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12333,7 +12333,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12345,7 +12345,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12355,7 +12355,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12367,7 +12367,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12377,7 +12377,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12389,7 +12389,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12399,7 +12399,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -12414,7 +12414,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12428,7 +12428,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12438,7 +12438,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12450,7 +12450,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12460,7 +12460,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12472,7 +12472,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12482,7 +12482,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12494,7 +12494,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12504,7 +12504,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12516,7 +12516,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12526,7 +12526,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -12541,7 +12541,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12555,7 +12555,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12565,7 +12565,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12577,7 +12577,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12587,7 +12587,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12599,7 +12599,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12609,7 +12609,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12621,7 +12621,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12631,7 +12631,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12643,7 +12643,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12653,7 +12653,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -12668,7 +12668,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12682,7 +12682,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12692,7 +12692,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12704,7 +12704,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12714,7 +12714,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12726,7 +12726,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12736,7 +12736,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12748,7 +12748,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12758,7 +12758,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12770,7 +12770,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12780,7 +12780,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -12795,7 +12795,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12809,7 +12809,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12819,7 +12819,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12831,7 +12831,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12841,7 +12841,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12853,7 +12853,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12863,7 +12863,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12875,7 +12875,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12885,7 +12885,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12897,7 +12897,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12907,7 +12907,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -12922,7 +12922,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12936,7 +12936,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12946,7 +12946,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12958,7 +12958,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12968,7 +12968,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12980,7 +12980,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12990,7 +12990,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -13002,7 +13002,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -13012,7 +13012,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -13024,7 +13024,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -13034,7 +13034,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -13049,7 +13049,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -13063,7 +13063,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -13073,7 +13073,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -13085,7 +13085,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -13095,7 +13095,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -13103,7 +13103,7 @@ cont { lines { width: 5.8 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -13114,7 +13114,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -13125,7 +13125,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -13135,7 +13135,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -13143,7 +13143,7 @@ cont { lines { width: 7.8 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -13154,7 +13154,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -13165,7 +13165,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -13175,7 +13175,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -13183,7 +13183,7 @@ cont { lines { width: 9.0 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -13194,7 +13194,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -13205,7 +13205,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -13215,7 +13215,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -13230,7 +13230,7 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -13244,7 +13244,7 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -13258,7 +13258,7 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -13272,7 +13272,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -13282,7 +13282,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16297 + priority: 16326 } } element { @@ -13294,7 +13294,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -13304,7 +13304,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16297 + priority: 16326 } } element { @@ -13316,7 +13316,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -13326,7 +13326,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16297 + priority: 16326 } } element { @@ -13338,7 +13338,7 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -13348,7 +13348,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16297 + priority: 16326 } } } @@ -13359,7 +13359,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -13369,7 +13369,7 @@ cont { lines { width: 1.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -13379,7 +13379,7 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -13389,7 +13389,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -13397,7 +13397,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -13407,7 +13407,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -13415,7 +13415,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13425,7 +13425,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -13433,7 +13433,7 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13443,7 +13443,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -13451,7 +13451,7 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13461,7 +13461,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } element { @@ -13469,7 +13469,7 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13479,7 +13479,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } } @@ -13490,7 +13490,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -13500,7 +13500,7 @@ cont { lines { width: 1.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -13510,7 +13510,7 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -13520,7 +13520,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -13528,7 +13528,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -13538,7 +13538,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -13546,7 +13546,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13556,7 +13556,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -13564,7 +13564,7 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13574,7 +13574,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -13582,7 +13582,7 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13592,7 +13592,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } element { @@ -13600,7 +13600,7 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13610,7 +13610,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } } @@ -13621,7 +13621,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -13631,7 +13631,7 @@ cont { lines { width: 1.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -13641,7 +13641,7 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -13651,7 +13651,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -13659,7 +13659,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -13669,7 +13669,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -13681,14 +13681,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1323 + priority: 1355 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.0 color: 16777215 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13698,7 +13698,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -13710,14 +13710,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1323 + priority: 1355 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13727,7 +13727,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -13739,14 +13739,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1323 + priority: 1355 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13756,7 +13756,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } element { @@ -13768,14 +13768,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1323 + priority: 1355 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13785,7 +13785,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } } @@ -13796,7 +13796,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -13806,7 +13806,7 @@ cont { lines { width: 1.1 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -13816,7 +13816,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -13826,7 +13826,7 @@ cont { lines { width: 1.5 color: 16741158 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -13836,13 +13836,13 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 85 text_color: 0 } @@ -13852,7 +13852,7 @@ cont { lines { width: 1.7 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -13862,13 +13862,13 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 0 } @@ -13878,7 +13878,7 @@ cont { lines { width: 1.9 color: 16741158 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -13888,13 +13888,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 0 } @@ -13904,7 +13904,7 @@ cont { lines { width: 2.8 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -13914,13 +13914,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 120 text_color: 0 } @@ -13930,7 +13930,7 @@ cont { lines { width: 3.8 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -13940,13 +13940,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 175 text_color: 0 } @@ -13956,7 +13956,7 @@ cont { lines { width: 4.8 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -13966,13 +13966,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 250 text_color: 0 } @@ -13982,7 +13982,7 @@ cont { lines { width: 6.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -13992,13 +13992,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -14008,7 +14008,7 @@ cont { lines { width: 9.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -14018,13 +14018,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -14034,7 +14034,7 @@ cont { lines { width: 12.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -14044,13 +14044,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -14060,7 +14060,7 @@ cont { lines { width: 15.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -14070,13 +14070,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16396 + priority: 16435 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 350 text_color: 0 } @@ -14089,7 +14089,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14099,7 +14099,7 @@ cont { lines { width: 1.1 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14109,7 +14109,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14119,7 +14119,7 @@ cont { lines { width: 1.5 color: 16741158 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14129,13 +14129,13 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 85 text_color: 0 } @@ -14145,7 +14145,7 @@ cont { lines { width: 1.7 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14155,13 +14155,13 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 0 } @@ -14171,7 +14171,7 @@ cont { lines { width: 1.9 color: 16741158 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14181,13 +14181,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 0 } @@ -14197,21 +14197,21 @@ cont { lines { width: 2.8 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -14221,13 +14221,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 120 text_color: 0 } @@ -14237,21 +14237,21 @@ cont { lines { width: 3.8 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -14261,13 +14261,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 175 text_color: 0 } @@ -14277,21 +14277,21 @@ cont { lines { width: 4.8 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -14301,13 +14301,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 250 text_color: 0 } @@ -14317,21 +14317,21 @@ cont { lines { width: 6.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 12.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.8 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -14341,13 +14341,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -14357,21 +14357,21 @@ cont { lines { width: 9.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 19.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 21.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -14381,13 +14381,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -14397,21 +14397,21 @@ cont { lines { width: 12.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 26.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 28.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -14421,13 +14421,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -14437,21 +14437,21 @@ cont { lines { width: 15.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 32.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 34.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -14461,13 +14461,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16396 + priority: 16435 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 350 text_color: 0 } @@ -14480,7 +14480,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14490,7 +14490,7 @@ cont { lines { width: 1.1 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14500,7 +14500,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14510,7 +14510,7 @@ cont { lines { width: 1.5 color: 16741158 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14520,13 +14520,13 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 85 text_color: 0 } @@ -14536,7 +14536,7 @@ cont { lines { width: 1.7 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14546,13 +14546,13 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 0 } @@ -14566,14 +14566,14 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.9 color: 16557154 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14583,13 +14583,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 0 } @@ -14603,14 +14603,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 2.8 color: 16557154 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -14620,13 +14620,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 120 text_color: 0 } @@ -14640,14 +14640,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.8 color: 16557154 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -14657,13 +14657,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 175 text_color: 0 } @@ -14677,14 +14677,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.8 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -14694,13 +14694,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 250 text_color: 0 } @@ -14714,14 +14714,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -14731,13 +14731,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -14751,14 +14751,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -14768,13 +14768,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -14788,14 +14788,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -14805,13 +14805,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -14825,14 +14825,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 15.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -14842,13 +14842,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16396 + priority: 16435 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 350 text_color: 0 } @@ -14863,7 +14863,7 @@ cont { height: 9 color: 3355443 } - priority: 15423 + priority: 15465 } } element { @@ -14873,7 +14873,7 @@ cont { height: 10 color: 3355443 } - priority: 15423 + priority: 15465 } } element { @@ -14883,7 +14883,7 @@ cont { height: 10 color: 3355443 } - priority: 15423 + priority: 15465 } } element { @@ -14893,7 +14893,7 @@ cont { height: 10 color: 3355443 } - priority: 15423 + priority: 15465 } } element { @@ -14903,7 +14903,7 @@ cont { height: 10 color: 3355443 } - priority: 15423 + priority: 15465 } } } @@ -14917,7 +14917,7 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16387 + priority: 16425 } } element { @@ -14928,7 +14928,7 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16387 + priority: 16425 } } element { @@ -14939,7 +14939,7 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } } element { @@ -14947,7 +14947,7 @@ cont { lines { width: 1.4 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -14957,13 +14957,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 120 text_color: 0 } @@ -14973,7 +14973,7 @@ cont { lines { width: 1.8 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -14983,13 +14983,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 175 text_color: 0 } @@ -14999,7 +14999,7 @@ cont { lines { width: 2.4 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -15009,13 +15009,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 250 text_color: 0 } @@ -15025,7 +15025,7 @@ cont { lines { width: 3.0 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -15035,13 +15035,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -15051,7 +15051,7 @@ cont { lines { width: 4.5 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -15061,13 +15061,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -15077,7 +15077,7 @@ cont { lines { width: 6.0 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -15087,13 +15087,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -15103,7 +15103,7 @@ cont { lines { width: 7.5 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -15113,13 +15113,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 350 text_color: 0 } @@ -15135,7 +15135,7 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16387 + priority: 16425 } } element { @@ -15146,7 +15146,7 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16387 + priority: 16425 } } element { @@ -15157,7 +15157,7 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } } element { @@ -15165,7 +15165,7 @@ cont { lines { width: 1.4 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -15175,13 +15175,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 120 text_color: 0 } @@ -15191,21 +15191,21 @@ cont { lines { width: 1.8 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -15215,13 +15215,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 175 text_color: 0 } @@ -15231,21 +15231,21 @@ cont { lines { width: 2.4 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.8 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 5.6 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -15255,13 +15255,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 250 text_color: 0 } @@ -15271,21 +15271,21 @@ cont { lines { width: 3.0 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 6.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.8 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -15295,13 +15295,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -15311,21 +15311,21 @@ cont { lines { width: 4.5 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 10.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -15335,13 +15335,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -15351,21 +15351,21 @@ cont { lines { width: 6.0 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 14.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 16.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -15375,13 +15375,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -15391,21 +15391,21 @@ cont { lines { width: 7.5 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 17.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 19.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -15415,13 +15415,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 350 text_color: 0 } @@ -15437,7 +15437,7 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16387 + priority: 16425 } } element { @@ -15448,7 +15448,7 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16387 + priority: 16425 } } element { @@ -15459,7 +15459,7 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } } element { @@ -15471,14 +15471,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.4 color: 16557154 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -15488,13 +15488,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 120 text_color: 0 } @@ -15508,14 +15508,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.8 color: 16557154 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -15525,13 +15525,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 175 text_color: 0 } @@ -15545,14 +15545,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 2.4 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -15562,13 +15562,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 250 text_color: 0 } @@ -15582,14 +15582,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -15599,13 +15599,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -15619,14 +15619,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.5 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -15636,13 +15636,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -15656,14 +15656,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -15673,13 +15673,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -15693,14 +15693,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.5 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -15710,13 +15710,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 350 text_color: 0 } @@ -15733,7 +15733,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -15747,7 +15747,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -15757,7 +15757,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -15769,7 +15769,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -15779,7 +15779,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -15791,7 +15791,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -15801,7 +15801,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -15813,7 +15813,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -15823,7 +15823,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -15835,7 +15835,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -15845,7 +15845,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -15860,7 +15860,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -15874,7 +15874,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -15884,7 +15884,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -15896,7 +15896,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -15906,7 +15906,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -15918,7 +15918,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -15928,7 +15928,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -15940,7 +15940,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -15950,7 +15950,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -15962,7 +15962,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -15972,7 +15972,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -15987,7 +15987,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16001,7 +16001,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16011,7 +16011,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16023,7 +16023,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16033,7 +16033,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16045,7 +16045,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16055,7 +16055,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16067,7 +16067,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16077,7 +16077,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16089,7 +16089,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16099,7 +16099,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -16114,7 +16114,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16128,7 +16128,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16138,7 +16138,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16150,7 +16150,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16160,7 +16160,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16172,7 +16172,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16182,7 +16182,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16194,7 +16194,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16204,7 +16204,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16216,7 +16216,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16226,7 +16226,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -16241,7 +16241,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16255,7 +16255,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16265,7 +16265,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16277,7 +16277,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16287,7 +16287,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16299,7 +16299,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16309,7 +16309,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16321,7 +16321,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16331,7 +16331,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16343,7 +16343,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16353,7 +16353,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -16368,7 +16368,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16382,7 +16382,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16392,7 +16392,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16404,7 +16404,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16414,7 +16414,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16426,7 +16426,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16436,7 +16436,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16448,7 +16448,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16458,7 +16458,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16470,7 +16470,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16480,7 +16480,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -16495,7 +16495,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16509,7 +16509,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16519,7 +16519,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16531,7 +16531,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16541,7 +16541,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16553,7 +16553,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16563,7 +16563,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16575,7 +16575,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16585,7 +16585,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16597,7 +16597,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16607,7 +16607,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -16622,7 +16622,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16636,7 +16636,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16646,7 +16646,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16658,7 +16658,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16668,7 +16668,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16680,7 +16680,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16690,7 +16690,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16702,7 +16702,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16712,7 +16712,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16724,7 +16724,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16734,7 +16734,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -16749,7 +16749,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16763,7 +16763,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16773,7 +16773,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16785,7 +16785,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16795,7 +16795,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16807,7 +16807,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16817,7 +16817,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16829,7 +16829,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16839,7 +16839,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16851,7 +16851,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16861,7 +16861,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -16876,7 +16876,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16890,7 +16890,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16900,7 +16900,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16912,7 +16912,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16922,7 +16922,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16934,7 +16934,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16944,7 +16944,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16956,7 +16956,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16966,7 +16966,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16978,7 +16978,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16988,7 +16988,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -17003,7 +17003,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -17017,7 +17017,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -17027,7 +17027,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -17039,7 +17039,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -17049,7 +17049,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -17061,7 +17061,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -17071,7 +17071,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -17083,7 +17083,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -17093,7 +17093,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -17105,7 +17105,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -17115,7 +17115,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -17130,7 +17130,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -17144,7 +17144,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -17154,7 +17154,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -17166,7 +17166,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -17176,7 +17176,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -17184,7 +17184,7 @@ cont { lines { width: 5.0 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -17195,7 +17195,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -17206,7 +17206,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -17216,7 +17216,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -17224,7 +17224,7 @@ cont { lines { width: 7.0 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -17235,7 +17235,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -17246,7 +17246,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -17256,7 +17256,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -17264,7 +17264,7 @@ cont { lines { width: 9.0 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -17275,7 +17275,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -17286,7 +17286,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -17296,7 +17296,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -17311,7 +17311,7 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -17325,7 +17325,7 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -17335,7 +17335,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16297 + priority: 16326 } } element { @@ -17347,7 +17347,7 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -17357,7 +17357,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16297 + priority: 16326 } } element { @@ -17369,7 +17369,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -17379,7 +17379,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16297 + priority: 16326 } } element { @@ -17391,7 +17391,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -17401,7 +17401,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16297 + priority: 16326 } } element { @@ -17413,7 +17413,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -17423,7 +17423,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16297 + priority: 16326 } } element { @@ -17435,7 +17435,7 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -17445,7 +17445,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16297 + priority: 16326 } } } @@ -17460,7 +17460,7 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -17474,13 +17474,13 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } area { color: 15591638 - priority: -15703 + priority: -15674 } path_text { primary { @@ -17488,7 +17488,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16297 + priority: 16326 } } element { @@ -17500,13 +17500,13 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } area { color: 15591638 - priority: -15703 + priority: -15674 } path_text { primary { @@ -17514,7 +17514,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16297 + priority: 16326 } } element { @@ -17526,13 +17526,13 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } area { color: 15920858 - priority: -15703 + priority: -15674 } path_text { primary { @@ -17540,7 +17540,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16297 + priority: 16326 } } element { @@ -17552,13 +17552,13 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } area { color: 15920858 - priority: -15703 + priority: -15674 } path_text { primary { @@ -17566,7 +17566,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16297 + priority: 16326 } } element { @@ -17578,13 +17578,13 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } area { color: 15920858 - priority: -15703 + priority: -15674 } path_text { primary { @@ -17592,7 +17592,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16297 + priority: 16326 } } element { @@ -17604,13 +17604,13 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } area { color: 15920858 - priority: -15703 + priority: -15674 } path_text { primary { @@ -17618,7 +17618,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16297 + priority: 16326 } } } @@ -17633,14 +17633,14 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } @@ -17654,21 +17654,21 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.2 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.6 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -17678,7 +17678,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16297 + priority: 16326 } } element { @@ -17690,21 +17690,21 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -17714,7 +17714,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16297 + priority: 16326 } } element { @@ -17726,21 +17726,21 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 5.2 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -17750,7 +17750,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16297 + priority: 16326 } } element { @@ -17762,21 +17762,21 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 6.4 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -17786,7 +17786,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16297 + priority: 16326 } } element { @@ -17798,21 +17798,21 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.4 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -17822,7 +17822,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16297 + priority: 16326 } } element { @@ -17834,21 +17834,21 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 10.4 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 11.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -17858,7 +17858,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16297 + priority: 16326 } } } @@ -17873,7 +17873,7 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -17887,7 +17887,7 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -17897,7 +17897,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16297 + priority: 16326 } } element { @@ -17909,7 +17909,7 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -17919,7 +17919,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16297 + priority: 16326 } } element { @@ -17931,7 +17931,7 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1296 + priority: 1325 join: ROUNDJOIN cap: BUTTCAP } @@ -17942,7 +17942,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -17952,7 +17952,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16297 + priority: 16326 } } element { @@ -17964,7 +17964,7 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1296 + priority: 1325 join: ROUNDJOIN cap: BUTTCAP } @@ -17975,7 +17975,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -17985,7 +17985,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16297 + priority: 16326 } } element { @@ -17997,7 +17997,7 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1296 + priority: 1325 join: ROUNDJOIN cap: BUTTCAP } @@ -18008,7 +18008,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -18018,7 +18018,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16297 + priority: 16326 } } element { @@ -18030,7 +18030,7 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1296 + priority: 1325 join: ROUNDJOIN cap: BUTTCAP } @@ -18041,7 +18041,7 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -18051,7 +18051,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16297 + priority: 16326 } } } @@ -18062,7 +18062,7 @@ cont { lines { width: 0.9 color: 16746278 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18072,7 +18072,7 @@ cont { lines { width: 0.8 color: 16746278 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18082,7 +18082,7 @@ cont { lines { width: 1.2 color: 16746278 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18092,13 +18092,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 85 text_color: 0 } @@ -18108,7 +18108,7 @@ cont { lines { width: 1.5 color: 16749632 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18118,13 +18118,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 90 text_color: 0 } @@ -18134,7 +18134,7 @@ cont { lines { width: 1.7 color: 16749632 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18144,13 +18144,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 90 text_color: 0 } @@ -18160,7 +18160,7 @@ cont { lines { width: 2.4 color: 16749632 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: BUTTCAP } @@ -18170,13 +18170,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 120 text_color: 0 } @@ -18186,7 +18186,7 @@ cont { lines { width: 3.2 color: 16749632 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: BUTTCAP } @@ -18196,13 +18196,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 175 text_color: 0 } @@ -18212,7 +18212,7 @@ cont { lines { width: 4.2 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: BUTTCAP } @@ -18222,13 +18222,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 250 text_color: 0 } @@ -18238,7 +18238,7 @@ cont { lines { width: 4.8 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } @@ -18248,13 +18248,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 300 text_color: 0 } @@ -18264,7 +18264,7 @@ cont { lines { width: 7.0 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } @@ -18274,13 +18274,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 300 text_color: 0 } @@ -18290,7 +18290,7 @@ cont { lines { width: 10.0 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } @@ -18300,13 +18300,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 300 text_color: 0 } @@ -18316,7 +18316,7 @@ cont { lines { width: 13.0 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } @@ -18326,13 +18326,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 350 text_color: 0 } @@ -18345,7 +18345,7 @@ cont { lines { width: 0.9 color: 16746278 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18355,7 +18355,7 @@ cont { lines { width: 0.8 color: 16746278 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18365,7 +18365,7 @@ cont { lines { width: 1.2 color: 16746278 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18375,13 +18375,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 85 text_color: 0 } @@ -18391,7 +18391,7 @@ cont { lines { width: 1.5 color: 16749632 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18401,13 +18401,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 90 text_color: 0 } @@ -18417,7 +18417,7 @@ cont { lines { width: 1.7 color: 16749632 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18427,13 +18427,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 90 text_color: 0 } @@ -18443,7 +18443,7 @@ cont { lines { width: 2.4 color: 16749632 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: BUTTCAP } @@ -18453,13 +18453,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 120 text_color: 0 } @@ -18469,21 +18469,21 @@ cont { lines { width: 3.2 color: 16749632 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.4 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -18493,13 +18493,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 175 text_color: 0 } @@ -18509,21 +18509,21 @@ cont { lines { width: 4.2 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -18533,13 +18533,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 250 text_color: 0 } @@ -18549,21 +18549,21 @@ cont { lines { width: 4.8 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 9.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -18573,13 +18573,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 300 text_color: 0 } @@ -18589,21 +18589,21 @@ cont { lines { width: 7.0 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 15.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 17.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -18613,13 +18613,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 300 text_color: 0 } @@ -18629,21 +18629,21 @@ cont { lines { width: 10.0 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 22.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 24.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -18653,13 +18653,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 300 text_color: 0 } @@ -18669,21 +18669,21 @@ cont { lines { width: 13.0 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 28.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 30.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -18693,13 +18693,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 350 text_color: 0 } @@ -18712,7 +18712,7 @@ cont { lines { width: 0.9 color: 16746278 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18722,7 +18722,7 @@ cont { lines { width: 0.8 color: 16746278 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18732,7 +18732,7 @@ cont { lines { width: 1.2 color: 16746278 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18742,13 +18742,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 85 text_color: 0 } @@ -18758,7 +18758,7 @@ cont { lines { width: 1.5 color: 16749632 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18768,13 +18768,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 90 text_color: 0 } @@ -18784,7 +18784,7 @@ cont { lines { width: 1.7 color: 16749632 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18794,13 +18794,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 90 text_color: 0 } @@ -18810,7 +18810,7 @@ cont { lines { width: 2.4 color: 16749632 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: BUTTCAP } @@ -18820,13 +18820,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 120 text_color: 0 } @@ -18840,14 +18840,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1377 + priority: 1414 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.2 color: 16557154 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: BUTTCAP } @@ -18857,13 +18857,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 175 text_color: 0 } @@ -18877,14 +18877,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1377 + priority: 1414 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.2 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: BUTTCAP } @@ -18894,13 +18894,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 250 text_color: 0 } @@ -18914,14 +18914,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1377 + priority: 1414 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.8 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } @@ -18931,13 +18931,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 300 text_color: 0 } @@ -18951,14 +18951,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1377 + priority: 1414 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.0 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } @@ -18968,13 +18968,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 300 text_color: 0 } @@ -18988,14 +18988,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1377 + priority: 1414 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.0 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } @@ -19005,13 +19005,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 300 text_color: 0 } @@ -19025,14 +19025,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1377 + priority: 1414 join: ROUNDJOIN cap: BUTTCAP } lines { width: 13.0 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } @@ -19042,13 +19042,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 350 text_color: 0 } @@ -19064,7 +19064,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16369 + priority: 16405 } } element { @@ -19075,7 +19075,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16369 + priority: 16405 } } element { @@ -19086,7 +19086,7 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16369 + priority: 16405 } } element { @@ -19097,7 +19097,7 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16369 + priority: 16405 } } element { @@ -19105,7 +19105,7 @@ cont { lines { width: 3.2 color: 16749632 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: BUTTCAP } @@ -19115,13 +19115,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16369 + priority: 16405 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 175 text_color: 0 } @@ -19131,7 +19131,7 @@ cont { lines { width: 4.2 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: BUTTCAP } @@ -19141,13 +19141,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16369 + priority: 16405 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 250 text_color: 0 } @@ -19157,7 +19157,7 @@ cont { lines { width: 4.8 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } @@ -19167,13 +19167,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16369 + priority: 16405 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 300 text_color: 0 } @@ -19183,7 +19183,7 @@ cont { lines { width: 7.0 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } @@ -19193,13 +19193,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16369 + priority: 16405 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 300 text_color: 0 } @@ -19209,7 +19209,7 @@ cont { lines { width: 10.0 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } @@ -19219,13 +19219,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16369 + priority: 16405 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 300 text_color: 0 } @@ -19235,7 +19235,7 @@ cont { lines { width: 13.0 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } @@ -19245,13 +19245,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16369 + priority: 16405 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 350 text_color: 0 } @@ -19267,7 +19267,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16369 + priority: 16405 } } element { @@ -19278,7 +19278,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16369 + priority: 16405 } } element { @@ -19289,7 +19289,7 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16369 + priority: 16405 } } element { @@ -19300,7 +19300,7 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16369 + priority: 16405 } } element { @@ -19308,21 +19308,21 @@ cont { lines { width: 3.2 color: 16749632 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.4 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -19332,13 +19332,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16369 + priority: 16405 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 175 text_color: 0 } @@ -19348,21 +19348,21 @@ cont { lines { width: 4.2 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -19372,13 +19372,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16369 + priority: 16405 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 250 text_color: 0 } @@ -19388,21 +19388,21 @@ cont { lines { width: 4.8 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 9.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -19412,13 +19412,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16369 + priority: 16405 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 300 text_color: 0 } @@ -19428,21 +19428,21 @@ cont { lines { width: 7.0 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 15.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 17.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -19452,13 +19452,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16369 + priority: 16405 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 300 text_color: 0 } @@ -19468,21 +19468,21 @@ cont { lines { width: 10.0 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 22.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 24.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -19492,13 +19492,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16369 + priority: 16405 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 300 text_color: 0 } @@ -19508,21 +19508,21 @@ cont { lines { width: 13.0 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 28.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 30.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -19532,13 +19532,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16369 + priority: 16405 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 350 text_color: 0 } @@ -19554,7 +19554,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16369 + priority: 16405 } } element { @@ -19565,7 +19565,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16369 + priority: 16405 } } element { @@ -19576,7 +19576,7 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16369 + priority: 16405 } } element { @@ -19587,7 +19587,7 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16369 + priority: 16405 } } element { @@ -19599,14 +19599,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1368 + priority: 1404 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.2 color: 16557154 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: BUTTCAP } @@ -19616,13 +19616,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16369 + priority: 16405 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 175 text_color: 0 } @@ -19636,14 +19636,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1368 + priority: 1404 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.2 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: BUTTCAP } @@ -19653,13 +19653,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16369 + priority: 16405 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 250 text_color: 0 } @@ -19673,14 +19673,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1368 + priority: 1404 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.8 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } @@ -19690,13 +19690,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16369 + priority: 16405 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 300 text_color: 0 } @@ -19710,14 +19710,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1368 + priority: 1404 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.0 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } @@ -19727,13 +19727,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16369 + priority: 16405 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 300 text_color: 0 } @@ -19747,14 +19747,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1368 + priority: 1404 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.0 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } @@ -19764,13 +19764,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16369 + priority: 16405 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 300 text_color: 0 } @@ -19784,14 +19784,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1368 + priority: 1404 join: ROUNDJOIN cap: BUTTCAP } lines { width: 13.0 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } @@ -19801,13 +19801,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16369 + priority: 16405 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 350 text_color: 0 } @@ -19824,7 +19824,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: BUTTCAP } @@ -19838,7 +19838,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: BUTTCAP } @@ -19852,7 +19852,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: BUTTCAP } @@ -19862,7 +19862,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16261 + priority: 16287 } } element { @@ -19874,7 +19874,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -19884,7 +19884,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16261 + priority: 16287 } } element { @@ -19896,7 +19896,7 @@ cont { dd: 10.8 dd: 4.5 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -19906,7 +19906,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16261 + priority: 16287 } } element { @@ -19918,7 +19918,7 @@ cont { dd: 13.5 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -19928,7 +19928,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16261 + priority: 16287 } } element { @@ -19940,7 +19940,7 @@ cont { dd: 18.0 dd: 6.2 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -19950,7 +19950,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16261 + priority: 16287 } } } @@ -19961,7 +19961,7 @@ cont { lines { width: 1.0 color: 6510384 - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -19971,7 +19971,7 @@ cont { lines { width: 1.5 color: 6510384 - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -19981,7 +19981,7 @@ cont { lines { width: 1.8 color: 6510384 - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -19991,7 +19991,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -19999,7 +19999,7 @@ cont { lines { width: 3.0 color: 6510384 - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -20009,7 +20009,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -20017,7 +20017,7 @@ cont { lines { width: 3.0 color: 6510384 - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -20027,7 +20027,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -20035,7 +20035,7 @@ cont { lines { width: 4.0 color: 6510384 - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -20045,7 +20045,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -20056,7 +20056,7 @@ cont { lines { width: 0.8 color: 16316664 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -20066,7 +20066,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -20076,13 +20076,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 90 text_color: 0 } @@ -20092,7 +20092,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20102,13 +20102,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 120 text_color: 0 } @@ -20118,7 +20118,7 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20128,13 +20128,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 175 text_color: 0 } @@ -20144,7 +20144,7 @@ cont { lines { width: 3.2 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20154,13 +20154,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 250 text_color: 0 } @@ -20170,7 +20170,7 @@ cont { lines { width: 4.4 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20180,13 +20180,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -20196,7 +20196,7 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20206,13 +20206,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -20222,7 +20222,7 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20232,13 +20232,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -20248,7 +20248,7 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20258,13 +20258,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16342 + priority: 16376 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 350 text_color: 0 } @@ -20277,7 +20277,7 @@ cont { lines { width: 0.8 color: 16316664 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -20287,7 +20287,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -20297,13 +20297,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 90 text_color: 0 } @@ -20313,7 +20313,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20323,13 +20323,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 120 text_color: 0 } @@ -20339,7 +20339,7 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20349,13 +20349,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 175 text_color: 0 } @@ -20365,7 +20365,7 @@ cont { lines { width: 3.2 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20375,13 +20375,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 250 text_color: 0 } @@ -20391,7 +20391,7 @@ cont { lines { width: 4.4 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20401,13 +20401,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -20417,7 +20417,7 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20427,13 +20427,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -20443,7 +20443,7 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20453,13 +20453,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -20469,7 +20469,7 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20479,13 +20479,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16342 + priority: 16376 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 350 text_color: 0 } @@ -20498,7 +20498,7 @@ cont { lines { width: 0.8 color: 16316664 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -20508,7 +20508,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -20518,13 +20518,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 90 text_color: 0 } @@ -20534,7 +20534,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20544,13 +20544,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 120 text_color: 0 } @@ -20560,21 +20560,21 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -20584,13 +20584,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 175 text_color: 0 } @@ -20600,21 +20600,21 @@ cont { lines { width: 3.2 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.4 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -20624,13 +20624,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 250 text_color: 0 } @@ -20640,21 +20640,21 @@ cont { lines { width: 4.4 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.8 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.6 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -20664,13 +20664,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -20680,21 +20680,21 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 13.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 15.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -20704,13 +20704,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -20720,21 +20720,21 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 20.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 22.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -20744,13 +20744,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -20760,21 +20760,21 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 26.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 28.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -20784,13 +20784,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16342 + priority: 16376 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 350 text_color: 0 } @@ -20803,7 +20803,7 @@ cont { lines { width: 0.8 color: 16316664 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -20813,7 +20813,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -20823,13 +20823,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 90 text_color: 0 } @@ -20839,7 +20839,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20849,13 +20849,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 120 text_color: 0 } @@ -20865,7 +20865,7 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20875,13 +20875,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 175 text_color: 0 } @@ -20891,7 +20891,7 @@ cont { lines { width: 3.2 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20901,13 +20901,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 250 text_color: 0 } @@ -20921,14 +20921,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1375 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 16777215 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20938,13 +20938,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -20958,14 +20958,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1375 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20975,13 +20975,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -20995,14 +20995,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1375 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -21012,13 +21012,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -21032,14 +21032,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1375 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -21049,18 +21049,85 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16342 + priority: 16376 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 350 text_color: 0 } } } +cont { + name: "highway-rest_area" + element { + scale: 16 + symbol { + name: "picnic-m" + priority: 16623 + min_distance: 10 + } + path_text { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 16623 + } + } + element { + scale: 17 + symbol { + name: "picnic-l" + priority: 16623 + min_distance: 10 + } + path_text { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 16623 + } + } + element { + scale: 18 + symbol { + name: "picnic-l" + priority: 16623 + min_distance: 10 + } + path_text { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 16623 + } + } + element { + scale: 19 + symbol { + name: "picnic-l" + priority: 16623 + min_distance: 10 + } + path_text { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 16623 + } + } +} cont { name: "highway-road" element { @@ -21068,7 +21135,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -21078,7 +21145,7 @@ cont { lines { width: 1.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -21088,7 +21155,7 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -21098,7 +21165,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -21106,7 +21173,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -21116,7 +21183,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -21124,7 +21191,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -21134,7 +21201,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -21142,7 +21209,7 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -21152,7 +21219,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -21160,7 +21227,7 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -21170,7 +21237,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } element { @@ -21178,7 +21245,7 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -21188,7 +21255,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } } @@ -21199,7 +21266,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -21209,7 +21276,7 @@ cont { lines { width: 1.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -21219,7 +21286,7 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -21229,7 +21296,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -21237,7 +21304,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -21247,7 +21314,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -21255,21 +21322,21 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -21279,7 +21346,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -21287,21 +21354,21 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 12.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -21311,7 +21378,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -21319,21 +21386,21 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 18.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 18.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -21343,7 +21410,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } element { @@ -21351,21 +21418,21 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 24.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 24.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -21375,7 +21442,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } } @@ -21386,7 +21453,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -21396,7 +21463,7 @@ cont { lines { width: 1.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -21406,7 +21473,7 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -21416,7 +21483,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -21424,7 +21491,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -21434,7 +21501,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -21442,7 +21509,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -21452,7 +21519,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -21460,7 +21527,7 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -21470,7 +21537,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -21478,7 +21545,7 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -21488,7 +21555,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } element { @@ -21496,7 +21563,7 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -21506,7 +21573,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } } @@ -21517,7 +21584,7 @@ cont { lines { width: 1.0 color: 16777215 - priority: 1360 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -21527,7 +21594,7 @@ cont { color: 4473924 stroke_color: 871230427 } - priority: 16360 + priority: 16396 } } element { @@ -21535,7 +21602,7 @@ cont { lines { width: 1.3 color: 16777215 - priority: 1360 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -21545,7 +21612,7 @@ cont { color: 4473924 stroke_color: 871230427 } - priority: 16360 + priority: 16396 } } element { @@ -21553,7 +21620,7 @@ cont { lines { width: 1.6 color: 16777215 - priority: 1360 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -21563,13 +21630,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 90 text_color: 0 } @@ -21579,7 +21646,7 @@ cont { lines { width: 2.2 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: BUTTCAP } @@ -21589,13 +21656,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 120 text_color: 0 } @@ -21605,7 +21672,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: BUTTCAP } @@ -21615,13 +21682,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 175 text_color: 0 } @@ -21631,7 +21698,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: BUTTCAP } @@ -21641,13 +21708,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 250 text_color: 0 } @@ -21657,7 +21724,7 @@ cont { lines { width: 4.8 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } @@ -21667,13 +21734,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 300 text_color: 0 } @@ -21683,7 +21750,7 @@ cont { lines { width: 7.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } @@ -21693,13 +21760,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16360 + priority: 16396 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 300 text_color: 0 } @@ -21709,7 +21776,7 @@ cont { lines { width: 10.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } @@ -21719,13 +21786,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16360 + priority: 16396 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 300 text_color: 0 } @@ -21735,7 +21802,7 @@ cont { lines { width: 13.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } @@ -21745,13 +21812,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16360 + priority: 16396 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 350 text_color: 0 } @@ -21764,7 +21831,7 @@ cont { lines { width: 1.0 color: 16777215 - priority: 1360 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -21774,7 +21841,7 @@ cont { color: 4473924 stroke_color: 871230427 } - priority: 16360 + priority: 16396 } } element { @@ -21782,7 +21849,7 @@ cont { lines { width: 1.3 color: 16777215 - priority: 1360 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -21792,7 +21859,7 @@ cont { color: 4473924 stroke_color: 871230427 } - priority: 16360 + priority: 16396 } } element { @@ -21800,7 +21867,7 @@ cont { lines { width: 1.6 color: 16777215 - priority: 1360 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -21810,13 +21877,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 90 text_color: 0 } @@ -21826,7 +21893,7 @@ cont { lines { width: 2.2 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: BUTTCAP } @@ -21836,13 +21903,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 120 text_color: 0 } @@ -21852,21 +21919,21 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.8 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -21876,13 +21943,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 175 text_color: 0 } @@ -21892,21 +21959,21 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.8 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -21916,13 +21983,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 250 text_color: 0 } @@ -21932,21 +21999,21 @@ cont { lines { width: 4.8 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 9.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -21956,13 +22023,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 300 text_color: 0 } @@ -21972,21 +22039,21 @@ cont { lines { width: 7.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 15.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 17.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -21996,13 +22063,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16360 + priority: 16396 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 300 text_color: 0 } @@ -22012,21 +22079,21 @@ cont { lines { width: 10.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 22.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 24.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -22036,13 +22103,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16360 + priority: 16396 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 300 text_color: 0 } @@ -22052,21 +22119,21 @@ cont { lines { width: 13.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 28.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 30.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -22076,13 +22143,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16360 + priority: 16396 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 350 text_color: 0 } @@ -22095,7 +22162,7 @@ cont { lines { width: 1.0 color: 16777215 - priority: 1360 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -22105,7 +22172,7 @@ cont { color: 4473924 stroke_color: 871230427 } - priority: 16360 + priority: 16396 } } element { @@ -22113,7 +22180,7 @@ cont { lines { width: 1.3 color: 16777215 - priority: 1360 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -22123,7 +22190,7 @@ cont { color: 4473924 stroke_color: 871230427 } - priority: 16360 + priority: 16396 } } element { @@ -22131,7 +22198,7 @@ cont { lines { width: 1.6 color: 16777215 - priority: 1360 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -22141,13 +22208,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 90 text_color: 0 } @@ -22157,7 +22224,7 @@ cont { lines { width: 2.2 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: BUTTCAP } @@ -22167,13 +22234,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 120 text_color: 0 } @@ -22183,7 +22250,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: BUTTCAP } @@ -22193,13 +22260,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 175 text_color: 0 } @@ -22209,7 +22276,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: BUTTCAP } @@ -22219,13 +22286,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 250 text_color: 0 } @@ -22239,14 +22306,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1359 + priority: 1395 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.8 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } @@ -22256,13 +22323,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 300 text_color: 0 } @@ -22276,14 +22343,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1359 + priority: 1395 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } @@ -22293,13 +22360,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16360 + priority: 16396 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 300 text_color: 0 } @@ -22313,14 +22380,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1359 + priority: 1395 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } @@ -22330,13 +22397,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16360 + priority: 16396 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 300 text_color: 0 } @@ -22350,14 +22417,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1359 + priority: 1395 join: ROUNDJOIN cap: BUTTCAP } lines { width: 13.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } @@ -22367,13 +22434,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16360 + priority: 16396 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 350 text_color: 0 } @@ -22386,7 +22453,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: BUTTCAP } @@ -22396,7 +22463,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: BUTTCAP } @@ -22406,7 +22473,7 @@ cont { lines { width: 4.8 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } @@ -22416,7 +22483,7 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16351 + priority: 16386 } } element { @@ -22424,7 +22491,7 @@ cont { lines { width: 7.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } @@ -22434,7 +22501,7 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16351 + priority: 16386 } } element { @@ -22442,7 +22509,7 @@ cont { lines { width: 10.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } @@ -22452,7 +22519,7 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16351 + priority: 16386 } } element { @@ -22460,7 +22527,7 @@ cont { lines { width: 13.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } @@ -22470,7 +22537,7 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16351 + priority: 16386 } } } @@ -22481,21 +22548,21 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.8 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -22505,21 +22572,21 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.8 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -22529,21 +22596,21 @@ cont { lines { width: 4.8 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 9.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -22553,7 +22620,7 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16351 + priority: 16386 } } element { @@ -22561,21 +22628,21 @@ cont { lines { width: 7.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 15.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 17.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -22585,7 +22652,7 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16351 + priority: 16386 } } element { @@ -22593,21 +22660,21 @@ cont { lines { width: 10.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 22.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 24.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -22617,7 +22684,7 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16351 + priority: 16386 } } element { @@ -22625,21 +22692,21 @@ cont { lines { width: 13.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 28.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 30.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -22649,7 +22716,7 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16351 + priority: 16386 } } } @@ -22660,7 +22727,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: BUTTCAP } @@ -22670,7 +22737,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: BUTTCAP } @@ -22684,14 +22751,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1350 + priority: 1385 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.8 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } @@ -22701,7 +22768,7 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16351 + priority: 16386 } } element { @@ -22713,14 +22780,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1350 + priority: 1385 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } @@ -22730,7 +22797,7 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16351 + priority: 16386 } } element { @@ -22742,14 +22809,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1350 + priority: 1385 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } @@ -22759,7 +22826,7 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16351 + priority: 16386 } } element { @@ -22771,14 +22838,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1350 + priority: 1385 join: ROUNDJOIN cap: BUTTCAP } lines { width: 13.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } @@ -22788,7 +22855,7 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16351 + priority: 16386 } } } @@ -22799,7 +22866,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: BUTTCAP } @@ -22809,7 +22876,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: BUTTCAP } @@ -22819,7 +22886,7 @@ cont { lines { width: 1.6 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -22829,7 +22896,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -22837,7 +22904,7 @@ cont { lines { width: 2.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -22847,7 +22914,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -22855,7 +22922,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -22865,7 +22932,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } element { @@ -22873,7 +22940,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -22883,7 +22950,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } } @@ -22894,7 +22961,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: BUTTCAP } @@ -22904,7 +22971,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: BUTTCAP } @@ -22914,7 +22981,7 @@ cont { lines { width: 1.6 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -22924,7 +22991,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -22932,7 +22999,7 @@ cont { lines { width: 2.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -22942,7 +23009,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -22950,7 +23017,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -22960,7 +23027,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } element { @@ -22968,7 +23035,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -22978,7 +23045,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } } @@ -22989,7 +23056,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: BUTTCAP } @@ -22999,7 +23066,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: BUTTCAP } @@ -23009,21 +23076,21 @@ cont { lines { width: 1.6 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 3.2 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.6 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -23033,7 +23100,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23041,21 +23108,21 @@ cont { lines { width: 2.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 4.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -23065,7 +23132,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23073,21 +23140,21 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 6.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -23097,7 +23164,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } element { @@ -23105,21 +23172,21 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -23129,7 +23196,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } } @@ -23140,7 +23207,7 @@ cont { lines { width: 1.6 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23150,7 +23217,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23158,7 +23225,7 @@ cont { lines { width: 1.6 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23168,7 +23235,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23176,7 +23243,7 @@ cont { lines { width: 1.6 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23186,7 +23253,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23194,7 +23261,7 @@ cont { lines { width: 2.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23204,7 +23271,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23212,7 +23279,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23222,7 +23289,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } element { @@ -23230,7 +23297,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23240,7 +23307,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } } @@ -23251,7 +23318,7 @@ cont { lines { width: 1.6 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23261,7 +23328,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23269,7 +23336,7 @@ cont { lines { width: 1.6 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23279,7 +23346,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23287,7 +23354,7 @@ cont { lines { width: 1.6 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23297,7 +23364,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23305,7 +23372,7 @@ cont { lines { width: 2.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23315,7 +23382,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23323,7 +23390,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23333,7 +23400,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } element { @@ -23341,7 +23408,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23351,7 +23418,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } } @@ -23362,21 +23429,21 @@ cont { lines { width: 1.6 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 3.2 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.6 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -23386,7 +23453,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23394,21 +23461,21 @@ cont { lines { width: 1.6 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 3.2 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.6 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -23418,7 +23485,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23426,21 +23493,21 @@ cont { lines { width: 1.6 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 3.2 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.6 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -23450,7 +23517,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23458,21 +23525,21 @@ cont { lines { width: 2.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 4.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -23482,7 +23549,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23490,21 +23557,21 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 6.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -23514,7 +23581,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } element { @@ -23522,21 +23589,21 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -23546,7 +23613,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } } @@ -23557,7 +23624,7 @@ cont { lines { width: 1.6 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23567,7 +23634,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23575,7 +23642,7 @@ cont { lines { width: 1.6 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23585,7 +23652,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23593,7 +23660,7 @@ cont { lines { width: 1.6 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23603,7 +23670,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23611,7 +23678,7 @@ cont { lines { width: 2.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23621,7 +23688,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23629,7 +23696,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23639,7 +23706,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } element { @@ -23647,7 +23714,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23657,7 +23724,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } } @@ -23668,7 +23735,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: BUTTCAP } @@ -23678,7 +23745,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: BUTTCAP } @@ -23688,7 +23755,7 @@ cont { lines { width: 1.6 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23698,7 +23765,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23706,7 +23773,7 @@ cont { lines { width: 2.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23716,7 +23783,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23724,7 +23791,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23734,7 +23801,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } element { @@ -23742,7 +23809,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23752,7 +23819,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } } @@ -23763,7 +23830,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: BUTTCAP } @@ -23773,7 +23840,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: BUTTCAP } @@ -23783,7 +23850,7 @@ cont { lines { width: 1.6 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23793,7 +23860,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23801,7 +23868,7 @@ cont { lines { width: 2.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23811,7 +23878,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23819,7 +23886,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23829,7 +23896,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } element { @@ -23837,7 +23904,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23847,7 +23914,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } } @@ -23858,7 +23925,7 @@ cont { symbol { name: "speedcam-m" apply_for_type: 1 - priority: 16567 + priority: 16623 } } element { @@ -23866,7 +23933,7 @@ cont { symbol { name: "speedcam-m" apply_for_type: 1 - priority: 16567 + priority: 16623 } } element { @@ -23874,7 +23941,7 @@ cont { symbol { name: "speedcam-m" apply_for_type: 1 - priority: 16567 + priority: 16623 } } element { @@ -23882,7 +23949,7 @@ cont { symbol { name: "speedcam-m" apply_for_type: 1 - priority: 16567 + priority: 16623 } } element { @@ -23890,7 +23957,7 @@ cont { symbol { name: "speedcam-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } } element { @@ -23898,7 +23965,7 @@ cont { symbol { name: "speedcam-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } } element { @@ -23906,7 +23973,7 @@ cont { symbol { name: "speedcam-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } } } @@ -23921,7 +23988,7 @@ cont { dd: 1.5 dd: 1.5 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -23931,7 +23998,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -23943,7 +24010,7 @@ cont { dd: 2.3 dd: 2.3 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -23953,7 +24020,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -23965,7 +24032,7 @@ cont { dd: 3.2 dd: 3.2 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -23975,7 +24042,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -23987,7 +24054,7 @@ cont { dd: 4.0 dd: 4.0 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -23997,7 +24064,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } } @@ -24012,7 +24079,7 @@ cont { dd: 1.5 dd: 1.5 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -24022,7 +24089,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -24034,7 +24101,7 @@ cont { dd: 2.3 dd: 2.3 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -24044,7 +24111,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -24056,7 +24123,7 @@ cont { dd: 3.2 dd: 3.2 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -24066,7 +24133,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -24078,7 +24145,7 @@ cont { dd: 4.0 dd: 4.0 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -24088,7 +24155,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } } @@ -24103,7 +24170,7 @@ cont { dd: 1.5 dd: 1.5 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -24113,7 +24180,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -24125,7 +24192,7 @@ cont { dd: 2.3 dd: 2.3 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -24135,7 +24202,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -24147,7 +24214,7 @@ cont { dd: 3.2 dd: 3.2 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -24157,7 +24224,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -24169,7 +24236,7 @@ cont { dd: 4.0 dd: 4.0 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -24179,7 +24246,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } } @@ -24190,7 +24257,7 @@ cont { lines { width: 0.8 color: 16316664 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -24200,7 +24267,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -24210,13 +24277,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 90 text_color: 0 } @@ -24226,7 +24293,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -24236,13 +24303,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 120 text_color: 0 } @@ -24252,7 +24319,7 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -24262,13 +24329,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 175 text_color: 0 } @@ -24278,7 +24345,7 @@ cont { lines { width: 3.2 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -24288,13 +24355,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 250 text_color: 0 } @@ -24304,7 +24371,7 @@ cont { lines { width: 4.4 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -24314,13 +24381,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -24330,7 +24397,7 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -24340,13 +24407,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -24356,7 +24423,7 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -24366,13 +24433,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -24382,7 +24449,7 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -24392,13 +24459,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16342 + priority: 16376 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 350 text_color: 0 } @@ -24411,7 +24478,7 @@ cont { lines { width: 0.8 color: 16316664 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -24421,7 +24488,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -24431,13 +24498,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 90 text_color: 0 } @@ -24447,7 +24514,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -24457,13 +24524,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 120 text_color: 0 } @@ -24473,21 +24540,21 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -24497,13 +24564,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 175 text_color: 0 } @@ -24513,21 +24580,21 @@ cont { lines { width: 3.2 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.4 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -24537,13 +24604,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 250 text_color: 0 } @@ -24553,21 +24620,21 @@ cont { lines { width: 4.4 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.8 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.6 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -24577,13 +24644,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -24593,21 +24660,21 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 13.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 15.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -24617,13 +24684,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -24633,21 +24700,21 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 20.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 22.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -24657,13 +24724,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -24673,21 +24740,21 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 26.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 28.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -24697,13 +24764,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16342 + priority: 16376 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 350 text_color: 0 } @@ -24716,7 +24783,7 @@ cont { lines { width: 0.8 color: 16316664 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -24726,7 +24793,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -24736,13 +24803,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 90 text_color: 0 } @@ -24752,7 +24819,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -24762,13 +24829,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 120 text_color: 0 } @@ -24778,7 +24845,7 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -24788,13 +24855,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 175 text_color: 0 } @@ -24804,7 +24871,7 @@ cont { lines { width: 3.2 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -24814,13 +24881,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 250 text_color: 0 } @@ -24834,14 +24901,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1375 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 16777215 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -24851,13 +24918,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -24871,14 +24938,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1375 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -24888,13 +24955,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -24908,14 +24975,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1375 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -24925,13 +24992,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -24945,14 +25012,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1375 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -24962,13 +25029,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16342 + priority: 16376 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 350 text_color: 0 } @@ -24981,7 +25048,7 @@ cont { lines { width: 3.2 color: 16316664 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: BUTTCAP } @@ -24991,7 +25058,7 @@ cont { lines { width: 4.4 color: 16316664 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } @@ -25001,7 +25068,7 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } @@ -25011,7 +25078,7 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } @@ -25021,7 +25088,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16333 + priority: 16366 } } element { @@ -25029,7 +25096,7 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } @@ -25039,7 +25106,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16333 + priority: 16366 } } } @@ -25050,21 +25117,21 @@ cont { lines { width: 3.2 color: 16316664 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.4 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -25074,21 +25141,21 @@ cont { lines { width: 4.4 color: 16316664 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.8 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.6 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -25098,21 +25165,21 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 13.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 15.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -25122,21 +25189,21 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 20.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 22.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -25146,7 +25213,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16333 + priority: 16366 } } element { @@ -25154,21 +25221,21 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 26.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 28.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -25178,7 +25245,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16333 + priority: 16366 } } } @@ -25189,7 +25256,7 @@ cont { lines { width: 3.2 color: 16316664 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: BUTTCAP } @@ -25203,14 +25270,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1332 + priority: 1365 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 16777215 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } @@ -25224,14 +25291,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1332 + priority: 1365 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } @@ -25245,14 +25312,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1332 + priority: 1365 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } @@ -25262,7 +25329,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16333 + priority: 16366 } } element { @@ -25274,14 +25341,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1332 + priority: 1365 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } @@ -25291,7 +25358,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16333 + priority: 16366 } } } @@ -25306,7 +25373,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25320,7 +25387,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25330,7 +25397,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25342,7 +25409,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25352,7 +25419,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25364,7 +25431,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25374,7 +25441,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25386,7 +25453,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25396,7 +25463,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25408,7 +25475,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25418,7 +25485,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -25433,7 +25500,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25447,7 +25514,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25457,7 +25524,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25469,7 +25536,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25479,7 +25546,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25491,7 +25558,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25501,7 +25568,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25513,7 +25580,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25523,7 +25590,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25535,7 +25602,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25545,7 +25612,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -25560,7 +25627,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25574,7 +25641,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25584,7 +25651,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25596,7 +25663,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25606,7 +25673,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25618,7 +25685,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25628,7 +25695,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25640,7 +25707,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25650,7 +25717,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25662,7 +25729,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25672,7 +25739,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -25687,7 +25754,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25701,7 +25768,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25711,7 +25778,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25723,7 +25790,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25733,7 +25800,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25745,7 +25812,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25755,7 +25822,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25767,7 +25834,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25777,7 +25844,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25789,7 +25856,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25799,7 +25866,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -25814,7 +25881,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25828,7 +25895,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25838,7 +25905,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25850,7 +25917,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25860,7 +25927,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25872,7 +25939,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25882,7 +25949,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25894,7 +25961,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25904,7 +25971,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25916,7 +25983,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25926,7 +25993,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -25941,7 +26008,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25955,7 +26022,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25965,7 +26032,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25977,7 +26044,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25987,7 +26054,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25999,7 +26066,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26009,7 +26076,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26021,7 +26088,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26031,7 +26098,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26043,7 +26110,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26053,7 +26120,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -26068,7 +26135,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26082,7 +26149,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26092,7 +26159,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26104,7 +26171,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26114,7 +26181,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26126,7 +26193,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26136,7 +26203,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26148,7 +26215,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26158,7 +26225,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26170,7 +26237,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26180,7 +26247,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -26195,7 +26262,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26209,7 +26276,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26219,7 +26286,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26231,7 +26298,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26241,7 +26308,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26253,7 +26320,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26263,7 +26330,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26275,7 +26342,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26285,7 +26352,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26297,7 +26364,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26307,7 +26374,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -26322,7 +26389,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26336,7 +26403,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26346,7 +26413,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26358,7 +26425,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26368,7 +26435,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26380,7 +26447,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26390,7 +26457,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26402,7 +26469,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26412,7 +26479,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26424,7 +26491,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26434,7 +26501,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -26449,7 +26516,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26463,7 +26530,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26473,7 +26540,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26485,7 +26552,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26495,7 +26562,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26507,7 +26574,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26517,7 +26584,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26529,7 +26596,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26539,7 +26606,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26551,7 +26618,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26561,7 +26628,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -26576,7 +26643,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26590,7 +26657,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26600,7 +26667,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26612,7 +26679,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26622,7 +26689,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26634,7 +26701,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26644,7 +26711,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26656,7 +26723,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26666,7 +26733,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26678,7 +26745,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26688,7 +26755,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -26703,7 +26770,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26717,7 +26784,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26727,7 +26794,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26739,7 +26806,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26749,7 +26816,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26761,7 +26828,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26771,7 +26838,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26783,7 +26850,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26793,7 +26860,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26805,7 +26872,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26815,7 +26882,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -26830,7 +26897,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26844,7 +26911,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26854,7 +26921,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26866,7 +26933,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26876,7 +26943,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26888,7 +26955,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26898,7 +26965,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26910,7 +26977,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26920,7 +26987,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26932,7 +26999,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26942,7 +27009,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -26957,7 +27024,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26971,7 +27038,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26981,7 +27048,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26993,7 +27060,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -27003,7 +27070,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -27015,7 +27082,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -27025,7 +27092,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -27037,7 +27104,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -27047,7 +27114,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -27059,7 +27126,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -27069,7 +27136,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -27084,7 +27151,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -27098,7 +27165,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -27108,7 +27175,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -27120,7 +27187,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -27130,7 +27197,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -27142,7 +27209,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -27152,7 +27219,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -27164,7 +27231,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -27174,7 +27241,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -27186,7 +27253,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -27196,7 +27263,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -27211,7 +27278,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -27225,7 +27292,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -27235,7 +27302,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -27247,7 +27314,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -27257,7 +27324,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -27269,7 +27336,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -27279,7 +27346,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -27291,7 +27358,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -27301,7 +27368,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -27313,7 +27380,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -27323,7 +27390,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -27338,7 +27405,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -27352,7 +27419,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -27362,7 +27429,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -27374,7 +27441,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -27384,7 +27451,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -27396,7 +27463,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -27406,7 +27473,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -27418,7 +27485,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -27428,7 +27495,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -27440,7 +27507,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -27450,7 +27517,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -27461,7 +27528,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27471,7 +27538,7 @@ cont { lines { width: 1.1 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27481,7 +27548,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27491,7 +27558,7 @@ cont { lines { width: 1.5 color: 16741158 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27501,13 +27568,13 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 85 text_color: 0 } @@ -27517,7 +27584,7 @@ cont { lines { width: 1.7 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27527,13 +27594,13 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 0 } @@ -27543,7 +27610,7 @@ cont { lines { width: 1.9 color: 16741158 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27553,13 +27620,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 0 } @@ -27569,7 +27636,7 @@ cont { lines { width: 2.8 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -27579,13 +27646,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 120 text_color: 0 } @@ -27595,7 +27662,7 @@ cont { lines { width: 3.8 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -27605,13 +27672,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 175 text_color: 0 } @@ -27621,7 +27688,7 @@ cont { lines { width: 4.8 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -27631,13 +27698,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 250 text_color: 0 } @@ -27647,7 +27714,7 @@ cont { lines { width: 6.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -27657,13 +27724,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -27673,7 +27740,7 @@ cont { lines { width: 9.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -27683,13 +27750,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -27699,7 +27766,7 @@ cont { lines { width: 12.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -27709,13 +27776,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -27725,7 +27792,7 @@ cont { lines { width: 15.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -27735,13 +27802,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16396 + priority: 16435 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 350 text_color: 0 } @@ -27754,7 +27821,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27764,7 +27831,7 @@ cont { lines { width: 1.1 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27774,7 +27841,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27784,7 +27851,7 @@ cont { lines { width: 1.5 color: 16741158 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27794,13 +27861,13 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 85 text_color: 0 } @@ -27810,7 +27877,7 @@ cont { lines { width: 1.7 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27820,13 +27887,13 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 0 } @@ -27836,7 +27903,7 @@ cont { lines { width: 1.9 color: 16741158 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27846,13 +27913,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 0 } @@ -27862,21 +27929,21 @@ cont { lines { width: 2.8 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -27886,13 +27953,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 120 text_color: 0 } @@ -27902,21 +27969,21 @@ cont { lines { width: 3.8 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -27926,13 +27993,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 175 text_color: 0 } @@ -27942,21 +28009,21 @@ cont { lines { width: 4.8 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -27966,13 +28033,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 250 text_color: 0 } @@ -27982,21 +28049,21 @@ cont { lines { width: 6.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 12.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.8 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -28006,13 +28073,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -28022,21 +28089,21 @@ cont { lines { width: 9.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 19.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 21.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -28046,13 +28113,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -28062,21 +28129,21 @@ cont { lines { width: 12.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 26.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 28.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -28086,13 +28153,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -28102,21 +28169,21 @@ cont { lines { width: 15.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 32.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 34.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -28126,13 +28193,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16396 + priority: 16435 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 350 text_color: 0 } @@ -28145,7 +28212,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -28155,7 +28222,7 @@ cont { lines { width: 1.1 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -28165,7 +28232,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -28175,7 +28242,7 @@ cont { lines { width: 1.5 color: 16741158 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -28185,13 +28252,13 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 85 text_color: 0 } @@ -28201,7 +28268,7 @@ cont { lines { width: 1.7 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -28211,13 +28278,13 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 0 } @@ -28231,14 +28298,14 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.9 color: 16557154 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -28248,13 +28315,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 0 } @@ -28268,14 +28335,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 2.8 color: 16557154 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -28285,13 +28352,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 120 text_color: 0 } @@ -28305,14 +28372,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.8 color: 16557154 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -28322,13 +28389,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 175 text_color: 0 } @@ -28342,14 +28409,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.8 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -28359,13 +28426,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 250 text_color: 0 } @@ -28379,14 +28446,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -28396,13 +28463,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -28416,14 +28483,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -28433,13 +28500,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -28453,14 +28520,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -28470,13 +28537,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -28490,14 +28557,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 15.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -28507,13 +28574,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16396 + priority: 16435 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 350 text_color: 0 } @@ -28529,7 +28596,7 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16387 + priority: 16425 } } element { @@ -28540,7 +28607,7 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16387 + priority: 16425 } } element { @@ -28551,7 +28618,7 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } } element { @@ -28559,7 +28626,7 @@ cont { lines { width: 1.4 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -28569,13 +28636,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 120 text_color: 0 } @@ -28585,7 +28652,7 @@ cont { lines { width: 1.8 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -28595,13 +28662,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 175 text_color: 0 } @@ -28611,7 +28678,7 @@ cont { lines { width: 2.4 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -28621,13 +28688,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 250 text_color: 0 } @@ -28637,7 +28704,7 @@ cont { lines { width: 3.0 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -28647,13 +28714,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -28663,7 +28730,7 @@ cont { lines { width: 4.5 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -28673,13 +28740,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -28689,7 +28756,7 @@ cont { lines { width: 6.0 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -28699,13 +28766,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -28715,7 +28782,7 @@ cont { lines { width: 7.5 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -28725,13 +28792,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 350 text_color: 0 } @@ -28747,7 +28814,7 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16387 + priority: 16425 } } element { @@ -28758,7 +28825,7 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16387 + priority: 16425 } } element { @@ -28769,7 +28836,7 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } } element { @@ -28777,7 +28844,7 @@ cont { lines { width: 1.4 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -28787,13 +28854,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 120 text_color: 0 } @@ -28803,21 +28870,21 @@ cont { lines { width: 1.8 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -28827,13 +28894,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 175 text_color: 0 } @@ -28843,21 +28910,21 @@ cont { lines { width: 2.4 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.8 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 5.6 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -28867,13 +28934,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 250 text_color: 0 } @@ -28883,21 +28950,21 @@ cont { lines { width: 3.0 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 6.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.8 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -28907,13 +28974,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -28923,21 +28990,21 @@ cont { lines { width: 4.5 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 10.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -28947,13 +29014,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -28963,21 +29030,21 @@ cont { lines { width: 6.0 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 14.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 16.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -28987,13 +29054,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -29003,21 +29070,21 @@ cont { lines { width: 7.5 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 17.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 19.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -29027,13 +29094,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 350 text_color: 0 } @@ -29049,7 +29116,7 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16387 + priority: 16425 } } element { @@ -29060,7 +29127,7 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16387 + priority: 16425 } } element { @@ -29071,7 +29138,7 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } } element { @@ -29083,14 +29150,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.4 color: 16557154 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -29100,13 +29167,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 120 text_color: 0 } @@ -29120,14 +29187,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.8 color: 16557154 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -29137,13 +29204,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 175 text_color: 0 } @@ -29157,14 +29224,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 2.4 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -29174,13 +29241,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 250 text_color: 0 } @@ -29194,14 +29261,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -29211,13 +29278,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -29231,14 +29298,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.5 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -29248,13 +29315,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -29268,14 +29335,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -29285,13 +29352,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -29305,14 +29372,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.5 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -29322,13 +29389,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 350 text_color: 0 } @@ -29341,7 +29408,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -29351,7 +29418,7 @@ cont { lines { width: 1.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29361,7 +29428,7 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29371,7 +29438,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -29379,7 +29446,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29389,7 +29456,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -29397,7 +29464,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29407,7 +29474,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -29415,7 +29482,7 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29425,7 +29492,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -29433,7 +29500,7 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29443,7 +29510,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } element { @@ -29451,7 +29518,7 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29461,7 +29528,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } } @@ -29472,7 +29539,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -29482,7 +29549,7 @@ cont { lines { width: 1.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29492,7 +29559,7 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29502,7 +29569,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -29510,7 +29577,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29520,7 +29587,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -29528,7 +29595,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29538,7 +29605,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -29546,7 +29613,7 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29556,7 +29623,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -29564,7 +29631,7 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29574,7 +29641,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } element { @@ -29582,7 +29649,7 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29592,7 +29659,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } } @@ -29603,7 +29670,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -29613,7 +29680,7 @@ cont { lines { width: 1.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29623,21 +29690,21 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -29647,7 +29714,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -29655,21 +29722,21 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.8 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -29679,7 +29746,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -29687,21 +29754,21 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.8 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -29711,7 +29778,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -29719,21 +29786,21 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 13.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 15.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -29743,7 +29810,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -29751,21 +29818,21 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 20.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 22.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -29775,7 +29842,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } element { @@ -29783,21 +29850,21 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 26.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 28.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -29807,7 +29874,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } } @@ -29818,7 +29885,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -29828,7 +29895,7 @@ cont { lines { width: 1.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29838,7 +29905,7 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29848,7 +29915,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -29856,7 +29923,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29866,7 +29933,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -29878,14 +29945,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1323 + priority: 1355 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.0 color: 16777215 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29895,7 +29962,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -29907,14 +29974,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1323 + priority: 1355 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29924,7 +29991,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -29936,14 +30003,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1323 + priority: 1355 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29953,7 +30020,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } element { @@ -29965,14 +30032,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1323 + priority: 1355 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29982,7 +30049,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } } @@ -29993,7 +30060,7 @@ cont { lines { width: 0.5 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -30003,7 +30070,7 @@ cont { lines { width: 0.7 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -30013,7 +30080,7 @@ cont { lines { width: 0.7 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -30023,7 +30090,7 @@ cont { lines { width: 0.7 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -30033,7 +30100,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -30043,7 +30110,7 @@ cont { lines { width: 0.8 color: 16742950 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -30056,7 +30123,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -30066,7 +30133,7 @@ cont { lines { width: 0.7 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -30076,7 +30143,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -30086,7 +30153,7 @@ cont { lines { width: 0.8 color: 16742950 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -30098,7 +30165,7 @@ cont { scale: 17 symbol { name: "remains-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -30106,14 +30173,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "remains-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -30121,14 +30188,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "remains-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -30136,7 +30203,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -30146,7 +30213,7 @@ cont { scale: 16 symbol { name: "monument-m" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30155,14 +30222,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 17 symbol { name: "monument-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30171,14 +30238,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "monument-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30187,14 +30254,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "monument-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30203,7 +30270,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -30213,7 +30280,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16909 + priority: 16900 min_distance: 12 } caption { @@ -30222,14 +30289,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15909 + priority: 15900 } } element { scale: 13 symbol { name: "remains-s" - priority: 16909 + priority: 16900 min_distance: 12 } caption { @@ -30238,14 +30305,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15909 + priority: 15900 } } element { scale: 14 symbol { name: "remains-s" - priority: 16909 + priority: 16900 min_distance: 12 } caption { @@ -30254,14 +30321,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15909 + priority: 15900 } } element { scale: 15 symbol { name: "remains-m" - priority: 16909 + priority: 16900 min_distance: 5 } caption { @@ -30270,14 +30337,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15909 + priority: 15900 } } element { scale: 16 symbol { name: "remains-m" - priority: 16909 + priority: 16900 } caption { primary { @@ -30285,14 +30352,14 @@ cont { color: 4473924 offset_y: 12 } - priority: 15909 + priority: 15900 } } element { scale: 17 symbol { name: "remains-l" - priority: 16909 + priority: 16900 } caption { primary { @@ -30300,14 +30367,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15909 + priority: 15900 } } element { scale: 18 symbol { name: "remains-l" - priority: 16909 + priority: 16900 } caption { primary { @@ -30315,14 +30382,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15909 + priority: 15900 } } element { scale: 19 symbol { name: "remains-l" - priority: 16909 + priority: 16900 } caption { primary { @@ -30330,7 +30397,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15909 + priority: 15900 } } } @@ -30345,7 +30412,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -30359,7 +30426,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -30373,7 +30440,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -30387,7 +30454,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -30399,7 +30466,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16909 + priority: 16900 min_distance: 12 } caption { @@ -30408,14 +30475,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15909 + priority: 15900 } } element { scale: 13 symbol { name: "remains-s" - priority: 16909 + priority: 16900 min_distance: 12 } caption { @@ -30424,14 +30491,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15909 + priority: 15900 } } element { scale: 14 symbol { name: "remains-s" - priority: 16909 + priority: 16900 min_distance: 12 } caption { @@ -30440,14 +30507,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15909 + priority: 15900 } } element { scale: 15 symbol { name: "remains-m" - priority: 16909 + priority: 16900 min_distance: 5 } caption { @@ -30456,14 +30523,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15909 + priority: 15900 } } element { scale: 16 symbol { name: "remains-m" - priority: 16909 + priority: 16900 } caption { primary { @@ -30471,14 +30538,14 @@ cont { color: 4473924 offset_y: 12 } - priority: 15909 + priority: 15900 } } element { scale: 17 symbol { name: "remains-l" - priority: 16909 + priority: 16900 } caption { primary { @@ -30486,14 +30553,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15909 + priority: 15900 } } element { scale: 18 symbol { name: "remains-l" - priority: 16909 + priority: 16900 } caption { primary { @@ -30501,14 +30568,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15909 + priority: 15900 } } element { scale: 19 symbol { name: "remains-l" - priority: 16909 + priority: 16900 } caption { primary { @@ -30516,7 +30583,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15909 + priority: 15900 } } } @@ -30526,7 +30593,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 16657 + priority: 16722 min_distance: 24 } caption { @@ -30535,14 +30602,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15657 + priority: 15722 } } element { scale: 16 symbol { name: "monument-m" - priority: 16657 + priority: 16722 min_distance: 12 } caption { @@ -30551,14 +30618,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15657 + priority: 15722 } } element { scale: 17 symbol { name: "monument-l" - priority: 16657 + priority: 16722 } caption { primary { @@ -30566,14 +30633,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15657 + priority: 15722 } } element { scale: 18 symbol { name: "monument-l" - priority: 16657 + priority: 16722 } caption { primary { @@ -30581,14 +30648,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15657 + priority: 15722 } } element { scale: 19 symbol { name: "monument-l" - priority: 16657 + priority: 16722 } caption { primary { @@ -30596,7 +30663,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15657 + priority: 15722 } } } @@ -30606,7 +30673,7 @@ cont { scale: 13 symbol { name: "monument-s" - priority: 16657 + priority: 16722 min_distance: 12 } caption { @@ -30615,14 +30682,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15657 + priority: 15722 } } element { scale: 14 symbol { name: "monument-s" - priority: 16657 + priority: 16722 min_distance: 12 } caption { @@ -30631,14 +30698,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15657 + priority: 15722 } } element { scale: 15 symbol { name: "monument-m" - priority: 16657 + priority: 16722 min_distance: 24 } caption { @@ -30647,14 +30714,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15657 + priority: 15722 } } element { scale: 16 symbol { name: "monument-m" - priority: 16657 + priority: 16722 min_distance: 12 } caption { @@ -30663,14 +30730,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15657 + priority: 15722 } } element { scale: 17 symbol { name: "monument-l" - priority: 16657 + priority: 16722 } caption { primary { @@ -30678,14 +30745,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15657 + priority: 15722 } } element { scale: 18 symbol { name: "monument-l" - priority: 16657 + priority: 16722 } caption { primary { @@ -30693,14 +30760,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15657 + priority: 15722 } } element { scale: 19 symbol { name: "monument-l" - priority: 16657 + priority: 16722 } caption { primary { @@ -30708,7 +30775,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15657 + priority: 15722 } } } @@ -30830,7 +30897,7 @@ cont { scale: 16 symbol { name: "historic-ship-m" - priority: 16540 + priority: 16594 min_distance: 8 } caption { @@ -30839,14 +30906,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "historic-ship-l" - priority: 16540 + priority: 16594 min_distance: 8 } caption { @@ -30855,14 +30922,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "historic-ship-l" - priority: 16540 + priority: 16594 min_distance: 8 } caption { @@ -30871,14 +30938,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "historic-ship-l" - priority: 16540 + priority: 16594 min_distance: 8 } caption { @@ -30887,7 +30954,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -30897,7 +30964,7 @@ cont { scale: 16 symbol { name: "tomb-m" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30906,14 +30973,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 17 symbol { name: "tomb-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30922,14 +30989,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "tomb-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30938,14 +31005,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "tomb-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30954,7 +31021,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -30964,7 +31031,7 @@ cont { scale: 16 symbol { name: "monument-m" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30973,14 +31040,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 17 symbol { name: "monument-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30989,14 +31056,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "monument-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -31005,14 +31072,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "monument-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -31021,7 +31088,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -31031,7 +31098,7 @@ cont { scale: 16 symbol { name: "wayside_shrine-m" - priority: 16531 + priority: 16584 min_distance: 8 } } @@ -31039,7 +31106,7 @@ cont { scale: 17 symbol { name: "wayside_shrine-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -31048,14 +31115,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "wayside_shrine-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -31064,14 +31131,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "wayside_shrine-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -31080,7 +31147,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -31091,7 +31158,7 @@ cont { lines { width: 0.0 color: 0 - priority: 1423 + priority: 1465 pathsym { name: "arrow-xs" step: 144.0 @@ -31104,7 +31171,7 @@ cont { lines { width: 0.0 color: 0 - priority: 1423 + priority: 1465 pathsym { name: "arrow-s" step: 144.0 @@ -31117,7 +31184,7 @@ cont { lines { width: 0.0 color: 0 - priority: 1423 + priority: 1465 pathsym { name: "arrow-s" step: 184.0 @@ -31130,7 +31197,7 @@ cont { lines { width: 0.0 color: 0 - priority: 1423 + priority: 1465 pathsym { name: "arrow-m" step: 184.0 @@ -31143,7 +31210,7 @@ cont { lines { width: 0.0 color: 0 - priority: 1423 + priority: 1465 pathsym { name: "arrow-m" step: 184.0 @@ -31158,91 +31225,91 @@ cont { scale: 12 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 13 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 14 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 15 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 16 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 17 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 18 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 19 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } } @@ -31252,56 +31319,56 @@ cont { scale: 12 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 13 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 14 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 15 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 16 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 17 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 18 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 19 area { color: 9163744 - priority: -15856 + priority: -15842 } } } @@ -31311,18 +31378,18 @@ cont { scale: 14 area { color: 666683518 - priority: -15640 + priority: -15604 } } element { scale: 15 area { color: 12372094 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-m" - priority: 16360 + priority: 16396 } caption { primary { @@ -31330,18 +31397,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 16 area { color: 11781233 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-m" - priority: 16360 + priority: 16396 } caption { primary { @@ -31349,18 +31416,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 17 area { color: 11781233 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -31368,18 +31435,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 18 area { color: 11781233 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -31387,18 +31454,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 19 area { color: 11781233 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -31406,7 +31473,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } } @@ -31416,18 +31483,18 @@ cont { scale: 14 area { color: 666683518 - priority: -15640 + priority: -15604 } } element { scale: 15 area { color: 12372094 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-m" - priority: 16360 + priority: 16396 } caption { primary { @@ -31435,18 +31502,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 16 area { color: 11781233 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-m" - priority: 16360 + priority: 16396 } caption { primary { @@ -31454,18 +31521,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 17 area { color: 11781233 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -31473,18 +31540,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 18 area { color: 11781233 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -31492,18 +31559,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 19 area { color: 11781233 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -31511,7 +31578,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } } @@ -31554,70 +31621,70 @@ cont { scale: 15 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 16 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 17 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 18 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 19 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } } @@ -31627,91 +31694,91 @@ cont { scale: 12 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 13 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 14 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 15 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 16 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 17 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 18 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 19 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } } @@ -31721,56 +31788,56 @@ cont { scale: 12 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 13 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 14 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 15 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 16 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 17 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 18 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 19 area { color: 13029267 - priority: -15910 + priority: -15901 } } } @@ -31780,39 +31847,39 @@ cont { scale: 10 area { color: 13029267 - priority: -15928 + priority: -15921 } } element { scale: 11 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 12 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 13 area { color: 11781233 - priority: -15928 + priority: -15921 } } element { scale: 14 area { color: 11453035 - priority: -15928 + priority: -15921 } symbol { name: "park-s" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -31829,7 +31896,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -31837,7 +31904,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -31845,11 +31912,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15928 + priority: -15921 } symbol { name: "park-m" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -31866,7 +31933,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -31874,7 +31941,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -31882,11 +31949,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-m" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -31903,7 +31970,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -31911,7 +31978,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -31919,11 +31986,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -31940,7 +32007,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -31948,7 +32015,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -31956,11 +32023,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -31977,7 +32044,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -31985,11 +32052,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 } apply_if: "!name" } @@ -31997,11 +32064,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32018,7 +32085,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32026,11 +32093,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 } apply_if: "!name" } @@ -32041,39 +32108,39 @@ cont { scale: 10 area { color: 13029267 - priority: -15928 + priority: -15921 } } element { scale: 11 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 12 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 13 area { color: 11781233 - priority: -15928 + priority: -15921 } } element { scale: 14 area { color: 11453035 - priority: -15928 + priority: -15921 } symbol { name: "park-s" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32090,7 +32157,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32098,7 +32165,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -32106,11 +32173,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15928 + priority: -15921 } symbol { name: "park-m" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32127,7 +32194,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32135,7 +32202,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -32143,11 +32210,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-m" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32164,7 +32231,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32172,7 +32239,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -32180,11 +32247,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32201,7 +32268,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32209,7 +32276,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -32217,11 +32284,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32238,7 +32305,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32246,11 +32313,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 } apply_if: "!name" } @@ -32258,11 +32325,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32279,7 +32346,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32287,11 +32354,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 } apply_if: "!name" } @@ -32302,39 +32369,39 @@ cont { scale: 10 area { color: 13029267 - priority: -15928 + priority: -15921 } } element { scale: 11 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 12 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 13 area { color: 11781233 - priority: -15928 + priority: -15921 } } element { scale: 14 area { color: 11453035 - priority: -15928 + priority: -15921 } symbol { name: "park-s" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32351,7 +32418,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32359,7 +32426,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -32367,11 +32434,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15928 + priority: -15921 } symbol { name: "park-m" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32388,7 +32455,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32396,7 +32463,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -32404,11 +32471,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-m" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32425,7 +32492,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32433,7 +32500,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -32441,11 +32508,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32462,7 +32529,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32470,7 +32537,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -32478,11 +32545,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32499,7 +32566,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32507,11 +32574,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 } apply_if: "!name" } @@ -32519,11 +32586,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32540,7 +32607,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32548,11 +32615,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 } apply_if: "!name" } @@ -32563,39 +32630,39 @@ cont { scale: 10 area { color: 13029267 - priority: -15928 + priority: -15921 } } element { scale: 11 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 12 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 13 area { color: 11781233 - priority: -15928 + priority: -15921 } } element { scale: 14 area { color: 11453035 - priority: -15928 + priority: -15921 } symbol { name: "park-s" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32612,7 +32679,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32620,7 +32687,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -32628,11 +32695,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15928 + priority: -15921 } symbol { name: "park-m" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32649,7 +32716,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32657,7 +32724,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -32665,11 +32732,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-m" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32686,7 +32753,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32694,7 +32761,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -32702,11 +32769,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32723,7 +32790,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32731,7 +32798,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -32739,11 +32806,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32760,7 +32827,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32768,11 +32835,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 } apply_if: "!name" } @@ -32780,11 +32847,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32801,7 +32868,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32809,11 +32876,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 } apply_if: "!name" } @@ -32824,14 +32891,14 @@ cont { scale: 14 area { color: 2160707771 - priority: 1199 + priority: 1218 } } element { scale: 15 area { color: 1724500155 - priority: 1199 + priority: 1218 } } element { @@ -32842,7 +32909,7 @@ cont { width: 1.0 color: 10592406 } - priority: 1199 + priority: 1218 } } element { @@ -32853,7 +32920,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1199 + priority: 1218 } } element { @@ -32864,7 +32931,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1199 + priority: 1218 } } element { @@ -32875,7 +32942,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1199 + priority: 1218 } } } @@ -32885,56 +32952,56 @@ cont { scale: 12 area { color: 13620648 - priority: -15874 + priority: -15862 } } element { scale: 13 area { color: 13620648 - priority: -15874 + priority: -15862 } } element { scale: 14 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 15 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 16 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 17 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 18 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 19 area { color: 13029267 - priority: -15874 + priority: -15862 } } } @@ -32944,70 +33011,70 @@ cont { scale: 15 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 16 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 17 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 18 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 19 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } } @@ -33017,11 +33084,11 @@ cont { scale: 15 area { color: 15000299 - priority: -15433 + priority: -15377 } symbol { name: "recycling-m" - priority: 16567 + priority: 16623 } caption { primary { @@ -33029,18 +33096,18 @@ cont { color: 4473924 offset_y: 8 } - priority: 15567 + priority: 15623 } } element { scale: 16 area { color: 15000299 - priority: -15433 + priority: -15377 } symbol { name: "recycling-m" - priority: 16567 + priority: 16623 } caption { primary { @@ -33048,18 +33115,18 @@ cont { color: 4473924 offset_y: 8 } - priority: 15567 + priority: 15623 } } element { scale: 17 area { color: 15000299 - priority: -15433 + priority: -15377 } symbol { name: "recycling-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -33067,18 +33134,18 @@ cont { color: 4473924 offset_y: 8 } - priority: 15567 + priority: 15623 } } element { scale: 18 area { color: 15000299 - priority: -15433 + priority: -15377 } symbol { name: "recycling-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -33086,18 +33153,18 @@ cont { color: 4473924 offset_y: 8 } - priority: 15567 + priority: 15623 } } element { scale: 19 area { color: 15000299 - priority: -15433 + priority: -15377 } symbol { name: "recycling-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -33105,7 +33172,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15567 + priority: 15623 } } } @@ -33115,56 +33182,56 @@ cont { scale: 12 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 13 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 14 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 15 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 16 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 17 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 18 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 19 area { color: 13029267 - priority: -15910 + priority: -15901 } } } @@ -33174,25 +33241,25 @@ cont { scale: 14 area { color: 15022389 - priority: -15577 + priority: -15535 } } element { scale: 15 area { color: 15022389 - priority: -15577 + priority: -15535 } } element { scale: 16 area { color: 15022389 - priority: -15577 + priority: -15535 } symbol { name: "military-m" - priority: 16423 + priority: 16465 min_distance: 10 } } @@ -33200,11 +33267,11 @@ cont { scale: 17 area { color: 15022389 - priority: -15577 + priority: -15535 } symbol { name: "military-l" - priority: 16423 + priority: 16465 } caption { primary { @@ -33212,18 +33279,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15423 + priority: 15465 } } element { scale: 18 area { color: 15022389 - priority: -15577 + priority: -15535 } symbol { name: "military-l" - priority: 16423 + priority: 16465 } caption { primary { @@ -33231,18 +33298,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15423 + priority: 15465 } } element { scale: 19 area { color: 15022389 - priority: -15577 + priority: -15535 } symbol { name: "military-l" - priority: 16423 + priority: 16465 } caption { primary { @@ -33250,7 +33317,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15423 + priority: 15465 } } } @@ -33260,91 +33327,91 @@ cont { scale: 12 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 13 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 14 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 15 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 16 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 17 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 18 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 19 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } } @@ -33354,70 +33421,70 @@ cont { scale: 15 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 16 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 17 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 18 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 19 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } } @@ -33427,70 +33494,70 @@ cont { scale: 15 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 16 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 17 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 18 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 19 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } } @@ -33500,91 +33567,91 @@ cont { scale: 12 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 13 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 14 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 15 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 16 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 17 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 18 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 19 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } } @@ -33597,7 +33664,7 @@ cont { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33608,7 +33675,7 @@ cont { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33616,14 +33683,14 @@ cont { scale: 12 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33631,7 +33698,7 @@ cont { scale: 12 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -33639,14 +33706,14 @@ cont { scale: 13 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33654,7 +33721,7 @@ cont { scale: 13 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -33662,14 +33729,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33677,7 +33744,7 @@ cont { scale: 14 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -33685,14 +33752,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33700,7 +33767,7 @@ cont { scale: 15 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -33708,14 +33775,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33723,7 +33790,7 @@ cont { scale: 16 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -33731,14 +33798,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33746,7 +33813,7 @@ cont { scale: 17 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -33754,14 +33821,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33769,7 +33836,7 @@ cont { scale: 18 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -33777,14 +33844,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33792,7 +33859,7 @@ cont { scale: 19 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -33803,140 +33870,140 @@ cont { scale: 0 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 1 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 2 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 3 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 4 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 5 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 6 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 7 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 8 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 9 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 10 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 11 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 12 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 13 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 14 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 15 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 16 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 17 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 18 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 19 area { color: 9163744 - priority: -15856 + priority: -15842 } } } @@ -33946,56 +34013,56 @@ cont { scale: 12 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 13 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 14 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 15 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 16 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 17 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 18 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 19 area { color: 13029267 - priority: -15910 + priority: -15901 } } } @@ -34005,91 +34072,91 @@ cont { scale: 12 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 13 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 14 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 15 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 16 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 17 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 18 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 19 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } } @@ -34103,7 +34170,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -34114,7 +34181,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -34125,7 +34192,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -34135,7 +34202,7 @@ cont { scale: 16 symbol { name: "dog_park-m" - priority: 16540 + priority: 16594 min_distance: 30 } caption { @@ -34144,14 +34211,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "dog_park-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -34160,14 +34227,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "dog_park-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -34176,14 +34243,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "dog_park-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -34192,7 +34259,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -34202,7 +34269,7 @@ cont { scale: 16 symbol { name: "dog_park-m" - priority: 16540 + priority: 16594 min_distance: 30 } caption { @@ -34211,14 +34278,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "dog_park-l" - priority: 16567 + priority: 16623 min_distance: 20 } caption { @@ -34227,14 +34294,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 18 symbol { name: "dog_park-l" - priority: 16567 + priority: 16623 min_distance: 20 } caption { @@ -34243,14 +34310,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "dog_park-l" - priority: 16567 + priority: 16623 min_distance: 20 } caption { @@ -34259,7 +34326,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -34270,7 +34337,7 @@ cont { symbol { name: "gym-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -34287,7 +34354,7 @@ cont { symbol { name: "gym-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -34304,7 +34371,7 @@ cont { symbol { name: "gym-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -34323,39 +34390,39 @@ cont { scale: 12 area { color: 12372094 - priority: -15919 + priority: -15911 } } element { scale: 13 area { color: 11781233 - priority: -15919 + priority: -15911 } } element { scale: 14 area { color: 11453035 - priority: -15919 + priority: -15911 } } element { scale: 15 area { color: 11584112 - priority: -15919 + priority: -15911 } } element { scale: 16 area { color: 11190117 - priority: -15919 + priority: -15911 } symbol { name: "garden-m" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -34372,7 +34439,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -34380,7 +34447,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -34388,11 +34455,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "garden-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -34409,7 +34476,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -34417,7 +34484,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15955 + priority: -15951 } caption { primary { @@ -34425,7 +34492,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -34433,11 +34500,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "garden-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -34454,7 +34521,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -34462,11 +34529,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "garden-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -34483,7 +34550,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -34494,46 +34561,46 @@ cont { scale: 12 area { color: 13620648 - priority: -15874 + priority: -15862 } } element { scale: 13 area { color: 13620648 - priority: -15874 + priority: -15862 } } element { scale: 14 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 15 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 16 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 17 area { color: 13029267 - priority: -15865 + priority: -15852 } symbol { name: "golf-l" - priority: 16135 + priority: 16148 min_distance: 10 } caption { @@ -34542,18 +34609,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15135 + priority: 15148 } } element { scale: 18 area { color: 13029267 - priority: -15865 + priority: -15852 } symbol { name: "golf-l" - priority: 16135 + priority: 16148 min_distance: 10 } caption { @@ -34562,18 +34629,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15135 + priority: 15148 } } element { scale: 19 area { color: 13029267 - priority: -15865 + priority: -15852 } symbol { name: "golf-l" - priority: 16135 + priority: 16148 min_distance: 10 } caption { @@ -34582,7 +34649,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15135 + priority: 15148 } } } @@ -34596,7 +34663,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -34607,7 +34674,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -34618,7 +34685,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -34628,7 +34695,7 @@ cont { scale: 10 symbol { name: "nparkf-s" - priority: 16603 + priority: 16663 min_distance: 20 } } @@ -34636,7 +34703,7 @@ cont { scale: 11 symbol { name: "nparkf-s" - priority: 16603 + priority: 16663 min_distance: 20 } } @@ -34644,7 +34711,7 @@ cont { scale: 12 symbol { name: "nparkf-s" - priority: 16603 + priority: 16663 min_distance: 12 } caption { @@ -34654,14 +34721,14 @@ cont { stroke_color: 872415231 offset_y: 6 } - priority: 15603 + priority: 15663 } } element { scale: 13 symbol { name: "nparkf-s" - priority: 16603 + priority: 16663 min_distance: 12 } caption { @@ -34671,18 +34738,18 @@ cont { stroke_color: 872415231 offset_y: 6 } - priority: 15603 + priority: 15663 } } element { scale: 14 area { color: 10400608 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-s" - priority: 16603 + priority: 16663 } caption { primary { @@ -34691,18 +34758,18 @@ cont { stroke_color: 872415231 offset_y: 8 } - priority: 15603 + priority: 15663 } } element { scale: 15 area { color: 10400608 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-m" - priority: 16603 + priority: 16663 } caption { primary { @@ -34711,18 +34778,18 @@ cont { stroke_color: 452984831 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 16 area { color: 10400608 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-m" - priority: 16603 + priority: 16663 } caption { primary { @@ -34731,18 +34798,18 @@ cont { stroke_color: 452984831 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 17 area { color: 10400608 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -34751,18 +34818,18 @@ cont { stroke_color: 452984831 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 18 area { color: 10400608 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -34771,18 +34838,18 @@ cont { stroke_color: 452984831 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 19 area { color: 10400608 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -34791,7 +34858,7 @@ cont { stroke_color: 452984831 offset_y: 10 } - priority: 15603 + priority: 15663 } } } @@ -34801,39 +34868,39 @@ cont { scale: 10 area { color: 12372094 - priority: -15919 + priority: -15911 } } element { scale: 11 area { color: 12372094 - priority: -15919 + priority: -15911 } } element { scale: 12 area { color: 12372094 - priority: -15919 + priority: -15911 } } element { scale: 13 area { color: 11781233 - priority: -15919 + priority: -15911 } } element { scale: 14 area { color: 11453035 - priority: -15919 + priority: -15911 } symbol { name: "park-s" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -34850,7 +34917,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -34858,7 +34925,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -34866,11 +34933,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15919 + priority: -15911 } symbol { name: "park-m" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -34887,7 +34954,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -34895,7 +34962,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -34903,11 +34970,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15919 + priority: -15911 } symbol { name: "park-m" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -34924,7 +34991,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -34932,7 +34999,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -34940,11 +35007,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -34961,7 +35028,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -34969,7 +35036,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15955 + priority: -15951 } caption { primary { @@ -34977,7 +35044,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -34985,11 +35052,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35006,7 +35073,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -35014,11 +35081,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 } caption { primary { @@ -35026,7 +35093,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -35034,11 +35101,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35055,7 +35122,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -35063,11 +35130,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 } caption { primary { @@ -35075,7 +35142,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -35086,39 +35153,39 @@ cont { scale: 10 area { color: 12372094 - priority: -15919 + priority: -15911 } } element { scale: 11 area { color: 12372094 - priority: -15919 + priority: -15911 } } element { scale: 12 area { color: 12372094 - priority: -15919 + priority: -15911 } } element { scale: 13 area { color: 11781233 - priority: -15919 + priority: -15911 } } element { scale: 14 area { color: 11453035 - priority: -15919 + priority: -15911 } symbol { name: "park-s" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -35135,7 +35202,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -35143,7 +35210,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -35151,11 +35218,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15919 + priority: -15911 } symbol { name: "park-m" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -35172,7 +35239,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -35180,7 +35247,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -35188,11 +35255,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15919 + priority: -15911 } symbol { name: "park-m" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -35209,7 +35276,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -35217,7 +35284,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -35225,11 +35292,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35246,7 +35313,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -35254,7 +35321,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15955 + priority: -15951 } caption { primary { @@ -35262,7 +35329,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -35270,11 +35337,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35291,7 +35358,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -35299,11 +35366,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 } caption { primary { @@ -35311,7 +35378,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -35319,11 +35386,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35340,7 +35407,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -35348,11 +35415,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 } caption { primary { @@ -35360,7 +35427,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -35371,39 +35438,39 @@ cont { scale: 10 area { color: 12372094 - priority: -15919 + priority: -15911 } } element { scale: 11 area { color: 12372094 - priority: -15919 + priority: -15911 } } element { scale: 12 area { color: 12372094 - priority: -15919 + priority: -15911 } } element { scale: 13 area { color: 11781233 - priority: -15919 + priority: -15911 } } element { scale: 14 area { color: 11453035 - priority: -15919 + priority: -15911 } symbol { name: "park-s" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -35420,7 +35487,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -35428,7 +35495,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -35436,11 +35503,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15919 + priority: -15911 } symbol { name: "park-m" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -35457,7 +35524,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -35465,7 +35532,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -35473,11 +35540,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15919 + priority: -15911 } symbol { name: "park-m" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -35494,7 +35561,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -35502,7 +35569,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -35510,11 +35577,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35531,7 +35598,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -35539,7 +35606,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15955 + priority: -15951 } caption { primary { @@ -35547,7 +35614,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -35555,11 +35622,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35576,7 +35643,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -35584,11 +35651,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 } caption { primary { @@ -35596,7 +35663,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -35604,11 +35671,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35625,7 +35692,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -35633,11 +35700,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 } caption { primary { @@ -35645,7 +35712,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -35656,39 +35723,39 @@ cont { scale: 10 area { color: 12372094 - priority: -15919 + priority: -15911 } } element { scale: 11 area { color: 12372094 - priority: -15919 + priority: -15911 } } element { scale: 12 area { color: 12372094 - priority: -15919 + priority: -15911 } } element { scale: 13 area { color: 11781233 - priority: -15919 + priority: -15911 } } element { scale: 14 area { color: 11453035 - priority: -15919 + priority: -15911 } symbol { name: "park-s" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -35705,7 +35772,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -35713,7 +35780,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -35721,11 +35788,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15919 + priority: -15911 } symbol { name: "park-m" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -35742,7 +35809,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -35750,7 +35817,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -35758,11 +35825,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15919 + priority: -15911 } symbol { name: "park-m" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -35779,7 +35846,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -35787,7 +35854,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -35795,11 +35862,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35816,7 +35883,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -35824,7 +35891,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15955 + priority: -15951 } caption { primary { @@ -35832,7 +35899,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -35840,11 +35907,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35861,7 +35928,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -35869,11 +35936,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 } caption { primary { @@ -35881,7 +35948,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -35889,11 +35956,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35910,7 +35977,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -35918,11 +35985,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 } caption { primary { @@ -35930,7 +35997,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -35941,26 +36008,26 @@ cont { scale: 15 area { color: 13749671 - priority: -15964 + priority: -15961 } } element { scale: 16 area { color: 13749671 - priority: -15964 + priority: -15961 } } element { scale: 17 area { color: 13749671 - priority: -15955 + priority: -15951 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35976,12 +36043,12 @@ cont { scale: 18 area { color: 13749671 - priority: -15955 + priority: -15951 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35997,12 +36064,12 @@ cont { scale: 19 area { color: 13749671 - priority: -15955 + priority: -15951 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -36021,26 +36088,26 @@ cont { scale: 15 area { color: 13749671 - priority: -15460 + priority: -15406 } } element { scale: 16 area { color: 13749671 - priority: -15460 + priority: -15406 } } element { scale: 17 area { color: 13749671 - priority: -15433 + priority: -15377 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -36056,12 +36123,12 @@ cont { scale: 18 area { color: 13749671 - priority: -15433 + priority: -15377 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -36077,12 +36144,12 @@ cont { scale: 19 area { color: 13749671 - priority: -15433 + priority: -15377 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -36101,12 +36168,12 @@ cont { scale: 17 area { color: 13749671 - priority: -15460 + priority: -15406 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -36115,19 +36182,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 area { color: 13749671 - priority: -15460 + priority: -15406 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -36136,19 +36203,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 area { color: 13749671 - priority: -15460 + priority: -15406 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -36157,7 +36224,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -36167,12 +36234,12 @@ cont { scale: 17 area { color: 13749671 - priority: -15433 + priority: -15377 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -36181,19 +36248,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 18 area { color: 13749671 - priority: -15433 + priority: -15377 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -36202,19 +36269,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 area { color: 13749671 - priority: -15433 + priority: -15377 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -36223,7 +36290,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -36234,7 +36301,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -36243,7 +36310,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { @@ -36251,7 +36318,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -36260,7 +36327,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { @@ -36268,7 +36335,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -36277,7 +36344,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -36291,7 +36358,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -36302,7 +36369,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -36313,7 +36380,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -36324,7 +36391,7 @@ cont { symbol { name: "sauna-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -36341,7 +36408,7 @@ cont { symbol { name: "sauna-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -36358,7 +36425,7 @@ cont { symbol { name: "sauna-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -36381,7 +36448,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -36392,7 +36459,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -36403,7 +36470,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -36414,7 +36481,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -36431,7 +36498,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -36448,7 +36515,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -36468,7 +36535,7 @@ cont { symbol { name: "climbing-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -36485,7 +36552,7 @@ cont { symbol { name: "climbing-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -36502,7 +36569,7 @@ cont { symbol { name: "climbing-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -36521,7 +36588,7 @@ cont { scale: 17 symbol { name: "archery-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -36537,7 +36604,7 @@ cont { scale: 18 symbol { name: "archery-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -36553,7 +36620,7 @@ cont { scale: 19 symbol { name: "archery-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -36573,7 +36640,7 @@ cont { symbol { name: "swimming-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -36590,7 +36657,7 @@ cont { symbol { name: "swimming-l" apply_for_type: 1 - priority: 16558 + priority: 16613 min_distance: 10 } caption { @@ -36607,7 +36674,7 @@ cont { symbol { name: "swimming-l" apply_for_type: 1 - priority: 16558 + priority: 16613 min_distance: 10 } caption { @@ -36627,7 +36694,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -36644,7 +36711,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -36661,7 +36728,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -36681,7 +36748,7 @@ cont { symbol { name: "stadium-s" apply_for_type: 1 - priority: 16882 + priority: 16871 min_distance: 16 } caption { @@ -36690,7 +36757,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15882 + priority: 15871 } } element { @@ -36698,7 +36765,7 @@ cont { symbol { name: "stadium-s" apply_for_type: 1 - priority: 16882 + priority: 16871 min_distance: 16 } caption { @@ -36707,19 +36774,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15882 + priority: 15871 } } element { scale: 15 area { color: 13749671 - priority: -15118 + priority: -15129 } symbol { name: "stadium-m" apply_for_type: 1 - priority: 16882 + priority: 16871 min_distance: 8 } caption { @@ -36728,19 +36795,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15882 + priority: 15871 } } element { scale: 16 area { color: 13749671 - priority: -15118 + priority: -15129 } symbol { name: "stadium-m" apply_for_type: 1 - priority: 16882 + priority: 16871 min_distance: 8 } caption { @@ -36749,19 +36816,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15882 + priority: 15871 } } element { scale: 17 area { color: 13749671 - priority: -15118 + priority: -15129 } symbol { name: "stadium-l" apply_for_type: 1 - priority: 16882 + priority: 16871 min_distance: 8 } caption { @@ -36770,19 +36837,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15882 + priority: 15871 } } element { scale: 18 area { color: 13749671 - priority: -15118 + priority: -15129 } symbol { name: "stadium-l" apply_for_type: 1 - priority: 16882 + priority: 16871 min_distance: 8 } caption { @@ -36791,19 +36858,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15882 + priority: 15871 } } element { scale: 19 area { color: 13749671 - priority: -15118 + priority: -15129 } symbol { name: "stadium-l" apply_for_type: 1 - priority: 16882 + priority: 16871 min_distance: 8 } caption { @@ -36812,7 +36879,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15882 + priority: 15871 } } } @@ -36822,39 +36889,39 @@ cont { scale: 13 area { color: 9163744 - priority: -15406 + priority: -15347 } } element { scale: 14 area { color: 9163744 - priority: -15406 + priority: -15347 } } element { scale: 15 area { color: 9163744 - priority: -15406 + priority: -15347 } } element { scale: 16 area { color: 9163744 - priority: -15406 + priority: -15347 } } element { scale: 17 area { color: 9163744 - priority: -15406 + priority: -15347 } symbol { name: "swimming-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -36863,18 +36930,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 area { color: 9163744 - priority: -15406 + priority: -15347 } symbol { name: "swimming-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -36883,18 +36950,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 area { color: 9163744 - priority: -15406 + priority: -15347 } symbol { name: "swimming-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -36903,7 +36970,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -36914,7 +36981,7 @@ cont { lines { width: 1.0 color: 6510384 - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -36924,7 +36991,7 @@ cont { lines { width: 1.5 color: 6510384 - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -36934,7 +37001,7 @@ cont { lines { width: 1.8 color: 6510384 - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -36944,7 +37011,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 15279 + priority: 15306 } } element { @@ -36952,7 +37019,7 @@ cont { lines { width: 3.0 color: 6510384 - priority: 1045 + priority: 1049 join: ROUNDJOIN cap: ROUNDCAP } @@ -36963,7 +37030,7 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -36971,7 +37038,7 @@ cont { lines { width: 3.0 color: 6510384 - priority: 1045 + priority: 1049 join: ROUNDJOIN cap: ROUNDCAP } @@ -36982,7 +37049,7 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -36990,7 +37057,7 @@ cont { lines { width: 4.0 color: 6510384 - priority: 1045 + priority: 1049 join: ROUNDJOIN cap: ROUNDCAP } @@ -37001,7 +37068,7 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -37011,7 +37078,7 @@ cont { scale: 16 symbol { name: "swimming-m" - priority: 16540 + priority: 16594 min_distance: 30 } caption { @@ -37020,14 +37087,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "swimming-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -37036,14 +37103,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "swimming-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -37052,14 +37119,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "swimming-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -37068,7 +37135,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -37078,14 +37145,14 @@ cont { scale: 12 area { color: 14934482 - priority: -15577 + priority: -15535 } } element { scale: 13 area { color: 14934482 - priority: -15577 + priority: -15535 } } element { @@ -37096,7 +37163,7 @@ cont { width: 2.0 color: 14934482 } - priority: -15577 + priority: -15535 } } element { @@ -37107,7 +37174,7 @@ cont { width: 2.0 color: 14934482 } - priority: -15577 + priority: -15535 } } element { @@ -37118,7 +37185,7 @@ cont { width: 2.0 color: 14934482 } - priority: -15577 + priority: -15535 } } element { @@ -37136,7 +37203,7 @@ cont { height: 10 color: 4473924 } - priority: 15423 + priority: 15465 } } element { @@ -37154,7 +37221,7 @@ cont { height: 10 color: 4473924 } - priority: 15423 + priority: 15465 } } element { @@ -37172,7 +37239,7 @@ cont { height: 10 color: 4473924 } - priority: 15423 + priority: 15465 } } } @@ -37182,7 +37249,7 @@ cont { scale: 18 symbol { name: "chimney-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -37190,14 +37257,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "chimney-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -37205,7 +37272,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -37219,7 +37286,7 @@ cont { width: 2.0 color: 14934482 } - priority: -15829 + priority: -15812 } } element { @@ -37230,7 +37297,7 @@ cont { width: 2.0 color: 14934482 } - priority: -15829 + priority: -15812 } } element { @@ -37241,7 +37308,7 @@ cont { width: 2.0 color: 14934482 } - priority: -15829 + priority: -15812 } } element { @@ -37252,7 +37319,7 @@ cont { width: 2.0 color: 14934482 } - priority: -15829 + priority: -15812 } } element { @@ -37263,7 +37330,7 @@ cont { width: 2.0 color: 14934482 } - priority: -15829 + priority: -15812 } } element { @@ -37274,7 +37341,7 @@ cont { width: 2.0 color: 14934482 } - priority: -15829 + priority: -15812 } } } @@ -37284,7 +37351,7 @@ cont { scale: 14 symbol { name: "lighthouse-s" - priority: 16603 + priority: 16663 min_distance: 5 } caption { @@ -37293,14 +37360,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15603 + priority: 15663 } } element { scale: 15 symbol { name: "lighthouse-m" - priority: 16603 + priority: 16663 } caption { primary { @@ -37308,14 +37375,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 16 symbol { name: "lighthouse-m" - priority: 16603 + priority: 16663 } caption { primary { @@ -37323,14 +37390,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 17 symbol { name: "lighthouse-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -37338,14 +37405,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 18 symbol { name: "lighthouse-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -37353,14 +37420,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 19 symbol { name: "lighthouse-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -37368,7 +37435,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15603 + priority: 15663 } } } @@ -37378,14 +37445,14 @@ cont { scale: 12 area { color: 14934482 - priority: -15577 + priority: -15535 } } element { scale: 13 area { color: 14934482 - priority: -15577 + priority: -15535 } } element { @@ -37396,7 +37463,7 @@ cont { width: 2.0 color: 14934482 } - priority: -15577 + priority: -15535 } } element { @@ -37407,7 +37474,7 @@ cont { width: 2.0 color: 14934482 } - priority: -15577 + priority: -15535 } } element { @@ -37418,7 +37485,7 @@ cont { width: 2.0 color: 14934482 } - priority: -15577 + priority: -15535 } } element { @@ -37436,7 +37503,7 @@ cont { height: 10 color: 4473924 } - priority: 15423 + priority: 15465 } } element { @@ -37454,7 +37521,7 @@ cont { height: 10 color: 4473924 } - priority: 15423 + priority: 15465 } } element { @@ -37472,7 +37539,7 @@ cont { height: 10 color: 4473924 } - priority: 15423 + priority: 15465 } } } @@ -37482,7 +37549,7 @@ cont { scale: 16 symbol { name: "windmill-m" - priority: 16540 + priority: 16594 min_distance: 30 } caption { @@ -37491,14 +37558,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "windmill-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -37507,14 +37574,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "windmill-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -37523,14 +37590,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "windmill-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -37539,7 +37606,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -37587,112 +37654,112 @@ cont { scale: 10 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 11 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 12 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 13 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 14 area { color: 9163744 - priority: -15856 + priority: -15842 } caption { primary { height: 10 color: 4495803 } - priority: 15144 + priority: 15158 } } element { scale: 15 area { color: 9163744 - priority: -15856 + priority: -15842 } caption { primary { height: 10 color: 4495803 } - priority: 15144 + priority: 15158 } } element { scale: 16 area { color: 9163744 - priority: -15856 + priority: -15842 } caption { primary { height: 11 color: 4495803 } - priority: 15144 + priority: 15158 } } element { scale: 17 area { color: 9163744 - priority: -15856 + priority: -15842 } caption { primary { height: 11 color: 4495803 } - priority: 15144 + priority: 15158 } } element { scale: 18 area { color: 9163744 - priority: -15856 + priority: -15842 } caption { primary { height: 11 color: 4495803 } - priority: 15144 + priority: 15158 } } element { scale: 19 area { color: 9163744 - priority: -15856 + priority: -15842 } caption { primary { height: 11 color: 4495803 } - priority: 15144 + priority: 15158 } } } @@ -37702,60 +37769,60 @@ cont { scale: 10 area { color: 16575614 - priority: -15460 + priority: -15406 } } element { scale: 11 area { color: 16575614 - priority: -15460 + priority: -15406 } } element { scale: 12 area { color: 16575614 - priority: -15460 + priority: -15406 } } element { scale: 13 area { color: 16575614 - priority: -15460 + priority: -15406 } } element { scale: 14 area { color: 16575614 - priority: -15460 + priority: -15406 } } element { scale: 15 area { color: 16575614 - priority: -15460 + priority: -15406 } caption { primary { height: 10 color: 4473924 } - priority: 15540 + priority: 15594 } } element { scale: 16 area { color: 16575614 - priority: -15460 + priority: -15406 } symbol { name: "beach-m" - priority: 16540 + priority: 16594 } caption { primary { @@ -37763,18 +37830,18 @@ cont { color: 4473924 offset_y: 5 } - priority: 15540 + priority: 15594 } } element { scale: 17 area { color: 16575614 - priority: -15460 + priority: -15406 } symbol { name: "beach-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -37782,18 +37849,18 @@ cont { color: 4473924 offset_y: 5 } - priority: 15540 + priority: 15594 } } element { scale: 18 area { color: 16575614 - priority: -15460 + priority: -15406 } symbol { name: "beach-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -37801,18 +37868,18 @@ cont { color: 4473924 offset_y: 5 } - priority: 15540 + priority: 15594 } } element { scale: 19 area { color: 16575614 - priority: -15460 + priority: -15406 } symbol { name: "beach-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -37820,7 +37887,7 @@ cont { color: 4473924 offset_y: 5 } - priority: 15540 + priority: 15594 } } } @@ -37893,7 +37960,7 @@ cont { scale: 11 symbol { name: "cave-s" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -37902,14 +37969,14 @@ cont { color: 4473924 offset_y: 5 } - priority: 15531 + priority: 15584 } } element { scale: 12 symbol { name: "cave-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -37917,14 +37984,14 @@ cont { color: 4473924 offset_y: 8 } - priority: 15531 + priority: 15584 } } element { scale: 13 symbol { name: "cave-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -37932,14 +37999,14 @@ cont { color: 4473924 offset_y: 8 } - priority: 15531 + priority: 15584 } } element { scale: 14 symbol { name: "cave-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -37947,14 +38014,14 @@ cont { color: 4473924 offset_y: 8 } - priority: 15531 + priority: 15584 } } element { scale: 15 symbol { name: "cave-m" - priority: 16531 + priority: 16584 } caption { primary { @@ -37962,14 +38029,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 16 symbol { name: "cave-m" - priority: 16531 + priority: 16584 } caption { primary { @@ -37977,14 +38044,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 17 symbol { name: "cave-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -37992,14 +38059,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "cave-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -38007,14 +38074,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "cave-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -38022,7 +38089,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -38318,56 +38385,56 @@ cont { scale: 12 area { color: 13620648 - priority: -15874 + priority: -15862 } } element { scale: 13 area { color: 13620648 - priority: -15874 + priority: -15862 } } element { scale: 14 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 15 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 16 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 17 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 18 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 19 area { color: 13029267 - priority: -15874 + priority: -15862 } } } @@ -38377,56 +38444,56 @@ cont { scale: 12 area { color: 13620648 - priority: -15874 + priority: -15862 } } element { scale: 13 area { color: 13620648 - priority: -15874 + priority: -15862 } } element { scale: 14 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 15 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 16 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 17 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 18 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 19 area { color: 13029267 - priority: -15874 + priority: -15862 } } } @@ -38436,84 +38503,84 @@ cont { scale: 0 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 1 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 2 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 3 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 4 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 5 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 6 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 7 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 8 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 9 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 10 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38521,7 +38588,7 @@ cont { scale: 10 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38529,14 +38596,14 @@ cont { scale: 11 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38544,7 +38611,7 @@ cont { scale: 11 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38552,14 +38619,14 @@ cont { scale: 12 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38567,7 +38634,7 @@ cont { scale: 12 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38575,14 +38642,14 @@ cont { scale: 13 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38590,7 +38657,7 @@ cont { scale: 13 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38598,14 +38665,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38613,7 +38680,7 @@ cont { scale: 14 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38621,14 +38688,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38636,7 +38703,7 @@ cont { scale: 15 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38644,14 +38711,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38659,7 +38726,7 @@ cont { scale: 16 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38667,14 +38734,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38682,7 +38749,7 @@ cont { scale: 17 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38690,14 +38757,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38705,7 +38772,7 @@ cont { scale: 18 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38713,14 +38780,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38728,7 +38795,7 @@ cont { scale: 19 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38882,7 +38949,7 @@ cont { scale: 12 symbol { name: "peakt-s" - priority: 16531 + priority: 16584 min_distance: 10 } caption { @@ -38891,7 +38958,7 @@ cont { color: 4473924 offset_y: 5 } - priority: 15531 + priority: 15584 } apply_if: "name" } @@ -38903,7 +38970,7 @@ cont { color: 4473924 offset_y: 5 } - priority: 15531 + priority: 15584 } apply_if: "!name" } @@ -38911,7 +38978,7 @@ cont { scale: 13 symbol { name: "peakt-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -38919,7 +38986,7 @@ cont { color: 4473924 offset_y: 5 } - priority: 15531 + priority: 15584 } apply_if: "name" } @@ -38931,7 +38998,7 @@ cont { color: 4473924 offset_y: 5 } - priority: 15531 + priority: 15584 } apply_if: "!name" } @@ -38939,7 +39006,7 @@ cont { scale: 14 symbol { name: "peakt-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -38947,7 +39014,7 @@ cont { color: 4473924 offset_y: 5 } - priority: 15531 + priority: 15584 } apply_if: "name" } @@ -38955,7 +39022,7 @@ cont { scale: 15 symbol { name: "peakt-m" - priority: 16531 + priority: 16584 } caption { primary { @@ -38963,14 +39030,14 @@ cont { color: 4473924 offset_y: 5 } - priority: 15531 + priority: 15584 } } element { scale: 16 symbol { name: "peakt-m" - priority: 16531 + priority: 16584 } caption { primary { @@ -38978,14 +39045,14 @@ cont { color: 4473924 offset_y: 5 } - priority: 15531 + priority: 15584 } } element { scale: 17 symbol { name: "peakt-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -38993,14 +39060,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "peakt-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -39008,14 +39075,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "peakt-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -39023,7 +39090,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15531 + priority: 15584 } } } @@ -39033,140 +39100,140 @@ cont { scale: 0 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 1 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 2 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 3 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 4 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 5 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 6 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 7 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 8 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 9 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 10 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 11 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 12 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 13 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 14 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 15 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 16 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 17 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 18 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 19 area { color: 9163744 - priority: -15856 + priority: -15842 } } } @@ -39214,140 +39281,140 @@ cont { scale: 0 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 1 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 2 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 3 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 4 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 5 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 6 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 7 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 8 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 9 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 10 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 11 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 12 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 13 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 14 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 15 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 16 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 17 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 18 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 19 area { color: 9163744 - priority: -15856 + priority: -15842 } } } @@ -39357,56 +39424,56 @@ cont { scale: 12 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 13 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 14 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 15 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 16 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 17 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 18 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 19 area { color: 13029267 - priority: -15910 + priority: -15901 } } } @@ -39416,7 +39483,7 @@ cont { scale: 14 symbol { name: "drinking-water-s" - priority: 16522 + priority: 16574 min_distance: 24 } caption { @@ -39425,14 +39492,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15522 + priority: 15574 } } element { scale: 15 symbol { name: "drinking-water-m" - priority: 16522 + priority: 16574 min_distance: 24 } caption { @@ -39441,14 +39508,14 @@ cont { color: 4473924 offset_y: 8 } - priority: 15522 + priority: 15574 } } element { scale: 16 symbol { name: "drinking-water-m" - priority: 16522 + priority: 16574 min_distance: 24 } caption { @@ -39457,14 +39524,14 @@ cont { color: 4473924 offset_y: 8 } - priority: 15522 + priority: 15574 } } element { scale: 17 symbol { name: "drinking-water-l" - priority: 16522 + priority: 16574 min_distance: 24 } caption { @@ -39473,14 +39540,14 @@ cont { color: 4473924 offset_y: 8 } - priority: 15522 + priority: 15574 } } element { scale: 18 symbol { name: "drinking-water-l" - priority: 16522 + priority: 16574 min_distance: 24 } caption { @@ -39489,14 +39556,14 @@ cont { color: 4473924 offset_y: 8 } - priority: 15522 + priority: 15574 } } element { scale: 19 symbol { name: "drinking-water-l" - priority: 16522 + priority: 16574 min_distance: 24 } caption { @@ -39505,7 +39572,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15522 + priority: 15574 } } } @@ -39515,7 +39582,7 @@ cont { scale: 10 symbol { name: "volcano-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -39523,14 +39590,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 11 symbol { name: "volcano-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -39538,14 +39605,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 12 symbol { name: "volcano-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -39553,14 +39620,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 13 symbol { name: "volcano-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -39568,14 +39635,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 14 symbol { name: "volcano-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -39583,14 +39650,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 15 symbol { name: "volcano-m" - priority: 16531 + priority: 16584 } caption { primary { @@ -39598,14 +39665,14 @@ cont { color: 4473924 offset_y: 8 } - priority: 15531 + priority: 15584 } } element { scale: 16 symbol { name: "volcano-m" - priority: 16531 + priority: 16584 } caption { primary { @@ -39613,14 +39680,14 @@ cont { color: 4473924 offset_y: 8 } - priority: 15531 + priority: 15584 } } element { scale: 17 symbol { name: "volcano-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -39628,14 +39695,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "volcano-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -39643,14 +39710,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "volcano-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -39658,7 +39725,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -39668,84 +39735,84 @@ cont { scale: 0 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 1 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 2 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 3 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 4 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 5 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 6 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 7 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 8 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 9 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 10 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39753,7 +39820,7 @@ cont { scale: 10 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -39761,14 +39828,14 @@ cont { scale: 11 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39776,7 +39843,7 @@ cont { scale: 11 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -39784,14 +39851,14 @@ cont { scale: 12 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39799,7 +39866,7 @@ cont { scale: 12 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -39807,14 +39874,14 @@ cont { scale: 13 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39822,7 +39889,7 @@ cont { scale: 13 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -39830,14 +39897,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 10 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39845,14 +39912,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 10 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area<4000000" } @@ -39860,14 +39927,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 10 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39875,14 +39942,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 10 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area<4000000" } @@ -39890,14 +39957,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 11 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39905,14 +39972,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 11 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area<4000000" } @@ -39920,14 +39987,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 11 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39935,14 +40002,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 11 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area<4000000" } @@ -39950,14 +40017,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 11 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39965,14 +40032,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 11 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area<4000000" } @@ -39980,14 +40047,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 11 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39995,14 +40062,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 11 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area<4000000" } @@ -40013,91 +40080,91 @@ cont { scale: 11 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 12 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 13 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 14 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 15 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 16 area { color: 13229526 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 4495803 } - priority: 15099 + priority: 15108 } } element { scale: 17 area { color: 13229526 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 4495803 } - priority: 15099 + priority: 15108 } } element { scale: 18 area { color: 13229526 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 4495803 } - priority: 15099 + priority: 15108 } } element { scale: 19 area { color: 13229526 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 4495803 } - priority: 15099 + priority: 15108 } } } @@ -40107,91 +40174,91 @@ cont { scale: 11 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 12 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 13 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 14 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 15 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 16 area { color: 13229526 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 4495803 } - priority: 15099 + priority: 15108 } } element { scale: 17 area { color: 13229526 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 4495803 } - priority: 15099 + priority: 15108 } } element { scale: 18 area { color: 13229526 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 4495803 } - priority: 15099 + priority: 15108 } } element { scale: 19 area { color: 13229526 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 4495803 } - priority: 15099 + priority: 15108 } } } @@ -40201,91 +40268,91 @@ cont { scale: 11 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 12 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 13 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 14 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 15 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 16 area { color: 13229526 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 4495803 } - priority: 15099 + priority: 15108 } } element { scale: 17 area { color: 13229526 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 4495803 } - priority: 15099 + priority: 15108 } } element { scale: 18 area { color: 13229526 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 4495803 } - priority: 15099 + priority: 15108 } } element { scale: 19 area { color: 13229526 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 4495803 } - priority: 15099 + priority: 15108 } } } @@ -40295,70 +40362,70 @@ cont { scale: 10 area { color: 13029267 - priority: -15928 + priority: -15921 } } element { scale: 11 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 12 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 13 area { color: 11781233 - priority: -15928 + priority: -15921 } } element { scale: 14 area { color: 11453035 - priority: -15928 + priority: -15921 } } element { scale: 15 area { color: 11584112 - priority: -15928 + priority: -15921 } } element { scale: 16 area { color: 11190117 - priority: -15928 + priority: -15921 } } element { scale: 17 area { color: 11190117 - priority: -15928 + priority: -15921 } } element { scale: 18 area { color: 11190117 - priority: -15928 + priority: -15921 } } element { scale: 19 area { color: 11190117 - priority: -15928 + priority: -15921 } } } @@ -40368,70 +40435,70 @@ cont { scale: 10 area { color: 13029267 - priority: -15928 + priority: -15921 } } element { scale: 11 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 12 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 13 area { color: 11781233 - priority: -15928 + priority: -15921 } } element { scale: 14 area { color: 11453035 - priority: -15928 + priority: -15921 } } element { scale: 15 area { color: 11584112 - priority: -15928 + priority: -15921 } } element { scale: 16 area { color: 11190117 - priority: -15928 + priority: -15921 } } element { scale: 17 area { color: 11190117 - priority: -15928 + priority: -15921 } } element { scale: 18 area { color: 11190117 - priority: -15928 + priority: -15921 } } element { scale: 19 area { color: 11190117 - priority: -15928 + priority: -15921 } } } @@ -40441,70 +40508,70 @@ cont { scale: 10 area { color: 13029267 - priority: -15928 + priority: -15921 } } element { scale: 11 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 12 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 13 area { color: 11781233 - priority: -15928 + priority: -15921 } } element { scale: 14 area { color: 11453035 - priority: -15928 + priority: -15921 } } element { scale: 15 area { color: 11584112 - priority: -15928 + priority: -15921 } } element { scale: 16 area { color: 11190117 - priority: -15928 + priority: -15921 } } element { scale: 17 area { color: 11190117 - priority: -15928 + priority: -15921 } } element { scale: 18 area { color: 11190117 - priority: -15928 + priority: -15921 } } element { scale: 19 area { color: 11190117 - priority: -15928 + priority: -15921 } } } @@ -40514,70 +40581,70 @@ cont { scale: 10 area { color: 13029267 - priority: -15928 + priority: -15921 } } element { scale: 11 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 12 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 13 area { color: 11781233 - priority: -15928 + priority: -15921 } } element { scale: 14 area { color: 11453035 - priority: -15928 + priority: -15921 } } element { scale: 15 area { color: 11584112 - priority: -15928 + priority: -15921 } } element { scale: 16 area { color: 11190117 - priority: -15928 + priority: -15921 } } element { scale: 17 area { color: 11190117 - priority: -15928 + priority: -15921 } } element { scale: 18 area { color: 11190117 - priority: -15928 + priority: -15921 } } element { scale: 19 area { color: 11190117 - priority: -15928 + priority: -15921 } } } @@ -40587,7 +40654,7 @@ cont { scale: 18 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40595,14 +40662,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40610,7 +40677,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -40620,7 +40687,7 @@ cont { scale: 18 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40628,14 +40695,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40643,7 +40710,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -40653,7 +40720,7 @@ cont { scale: 18 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40661,14 +40728,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40676,7 +40743,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -40686,7 +40753,7 @@ cont { scale: 18 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40694,14 +40761,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40709,7 +40776,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -40719,7 +40786,7 @@ cont { scale: 17 symbol { name: "lawyer-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -40728,14 +40795,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "lawyer-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -40744,14 +40811,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "lawyer-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -40760,7 +40827,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -40770,7 +40837,7 @@ cont { scale: 18 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40778,14 +40845,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40793,7 +40860,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -40804,7 +40871,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: BEVELJOIN cap: BUTTCAP } @@ -40814,7 +40881,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40824,7 +40891,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40834,7 +40901,7 @@ cont { lines { width: 1.6 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40844,7 +40911,7 @@ cont { lines { width: 1.6 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40854,7 +40921,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40864,7 +40931,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40874,7 +40941,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40887,7 +40954,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: BEVELJOIN cap: BUTTCAP } @@ -40897,7 +40964,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40907,7 +40974,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40917,7 +40984,7 @@ cont { lines { width: 1.6 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40927,7 +40994,7 @@ cont { lines { width: 1.6 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40937,7 +41004,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40947,7 +41014,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40957,7 +41024,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40970,7 +41037,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: BEVELJOIN cap: BUTTCAP } @@ -40980,7 +41047,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40990,7 +41057,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -41000,7 +41067,7 @@ cont { lines { width: 1.6 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -41010,7 +41077,7 @@ cont { lines { width: 1.6 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -41020,7 +41087,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -41030,7 +41097,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -41040,7 +41107,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -41053,7 +41120,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: BEVELJOIN cap: BUTTCAP } @@ -41063,7 +41130,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -41073,7 +41140,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -41083,7 +41150,7 @@ cont { lines { width: 1.6 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -41093,7 +41160,7 @@ cont { lines { width: 1.6 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -41103,7 +41170,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -41113,7 +41180,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -41123,7 +41190,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -41136,7 +41203,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: BEVELJOIN cap: BUTTCAP } @@ -41146,7 +41213,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -41156,7 +41223,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -41166,7 +41233,7 @@ cont { lines { width: 1.6 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -41176,7 +41243,7 @@ cont { lines { width: 1.6 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -41186,7 +41253,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -41196,7 +41263,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -41206,7 +41273,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -41219,7 +41286,7 @@ cont { lines { width: 0.8 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41229,7 +41296,7 @@ cont { lines { width: 1.1 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41239,7 +41306,7 @@ cont { lines { width: 1.1 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41249,7 +41316,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41259,7 +41326,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41269,7 +41336,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41282,7 +41349,7 @@ cont { lines { width: 1.0 color: 657933 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41292,7 +41359,7 @@ cont { lines { width: 1.1 color: 657933 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41302,7 +41369,7 @@ cont { lines { width: 1.1 color: 657933 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41312,7 +41379,7 @@ cont { lines { width: 1.5 color: 657933 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41322,7 +41389,7 @@ cont { lines { width: 1.5 color: 657933 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41332,7 +41399,7 @@ cont { lines { width: 1.5 color: 657933 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41345,7 +41412,7 @@ cont { lines { width: 1.0 color: 731131 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41355,7 +41422,7 @@ cont { lines { width: 1.1 color: 731131 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41365,7 +41432,7 @@ cont { lines { width: 1.1 color: 731131 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41375,7 +41442,7 @@ cont { lines { width: 1.5 color: 731131 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41385,7 +41452,7 @@ cont { lines { width: 1.5 color: 731131 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41395,7 +41462,7 @@ cont { lines { width: 1.5 color: 731131 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41408,7 +41475,7 @@ cont { lines { width: 1.0 color: 2229797 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41418,7 +41485,7 @@ cont { lines { width: 1.1 color: 2229797 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41428,7 +41495,7 @@ cont { lines { width: 1.1 color: 2229797 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41438,7 +41505,7 @@ cont { lines { width: 1.5 color: 2229797 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41448,7 +41515,7 @@ cont { lines { width: 1.5 color: 2229797 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41458,7 +41525,7 @@ cont { lines { width: 1.5 color: 2229797 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41471,7 +41538,7 @@ cont { lines { width: 1.0 color: 2229797 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41481,7 +41548,7 @@ cont { lines { width: 1.1 color: 2229797 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41491,7 +41558,7 @@ cont { lines { width: 1.1 color: 2229797 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41501,7 +41568,7 @@ cont { lines { width: 1.5 color: 2229797 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41511,7 +41578,7 @@ cont { lines { width: 1.5 color: 2229797 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41521,7 +41588,7 @@ cont { lines { width: 1.5 color: 2229797 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41534,7 +41601,7 @@ cont { lines { width: 1.0 color: 16518683 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41544,7 +41611,7 @@ cont { lines { width: 1.1 color: 16518683 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41554,7 +41621,7 @@ cont { lines { width: 1.1 color: 16518683 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41564,7 +41631,7 @@ cont { lines { width: 1.5 color: 16518683 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41574,7 +41641,7 @@ cont { lines { width: 1.5 color: 16518683 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41584,7 +41651,7 @@ cont { lines { width: 1.5 color: 16518683 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41597,7 +41664,7 @@ cont { lines { width: 1.0 color: 6286126 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41607,7 +41674,7 @@ cont { lines { width: 1.1 color: 6286126 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41617,7 +41684,7 @@ cont { lines { width: 1.1 color: 6286126 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41627,7 +41694,7 @@ cont { lines { width: 1.5 color: 6286126 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41637,7 +41704,7 @@ cont { lines { width: 1.5 color: 6286126 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41647,7 +41714,7 @@ cont { lines { width: 1.5 color: 6286126 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41660,7 +41727,7 @@ cont { lines { width: 0.8 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41670,7 +41737,7 @@ cont { lines { width: 1.1 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41680,7 +41747,7 @@ cont { lines { width: 1.1 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41690,7 +41757,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41700,7 +41767,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41710,7 +41777,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41723,7 +41790,7 @@ cont { lines { width: 0.8 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41733,7 +41800,7 @@ cont { lines { width: 1.1 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41743,7 +41810,7 @@ cont { lines { width: 1.1 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41753,7 +41820,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41763,7 +41830,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41773,7 +41840,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41796,7 +41863,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=1000000" } @@ -41815,7 +41882,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=150000" } @@ -41834,7 +41901,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=50000" } @@ -41853,7 +41920,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41872,7 +41939,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41891,7 +41958,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41910,7 +41977,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41929,7 +41996,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41948,7 +42015,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41967,7 +42034,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41986,7 +42053,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42005,7 +42072,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42024,7 +42091,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42043,7 +42110,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42062,7 +42129,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42081,7 +42148,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42103,7 +42170,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=1000000" } @@ -42122,7 +42189,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=150000" } @@ -42141,7 +42208,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=50000" } @@ -42160,7 +42227,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42179,7 +42246,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42198,7 +42265,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42217,7 +42284,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42236,7 +42303,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42255,7 +42322,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42274,7 +42341,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42293,7 +42360,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42312,7 +42379,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42331,7 +42398,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42350,7 +42417,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42369,7 +42436,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42388,7 +42455,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42410,7 +42477,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=1000000" } @@ -42429,7 +42496,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=150000" } @@ -42448,7 +42515,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=50000" } @@ -42467,7 +42534,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42486,7 +42553,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42505,7 +42572,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42524,7 +42591,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42543,7 +42610,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42562,7 +42629,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42581,7 +42648,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42600,7 +42667,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42619,7 +42686,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42638,7 +42705,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42657,7 +42724,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42676,7 +42743,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42695,7 +42762,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42717,7 +42784,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=1000000" } @@ -42736,7 +42803,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=150000" } @@ -42755,7 +42822,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=50000" } @@ -42774,7 +42841,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42793,7 +42860,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42812,7 +42879,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42831,7 +42898,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42850,7 +42917,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42869,7 +42936,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42888,7 +42955,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42907,7 +42974,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42926,7 +42993,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42945,7 +43012,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42964,7 +43031,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42983,7 +43050,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43002,7 +43069,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43014,7 +43081,7 @@ cont { symbol { name: "star-s" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -43030,7 +43097,7 @@ cont { offset_y: 9 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -43038,7 +43105,7 @@ cont { symbol { name: "star-m" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -43054,7 +43121,7 @@ cont { offset_y: 9 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -43062,7 +43129,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -43078,7 +43145,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -43086,7 +43153,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -43102,7 +43169,7 @@ cont { offset_y: 11 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -43110,7 +43177,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -43126,7 +43193,7 @@ cont { offset_y: 11 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -43134,7 +43201,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -43150,7 +43217,7 @@ cont { offset_y: 11 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -43158,7 +43225,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -43174,7 +43241,7 @@ cont { offset_y: 9 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -43182,7 +43249,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -43198,7 +43265,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -43206,7 +43273,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -43222,7 +43289,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -43230,7 +43297,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -43246,7 +43313,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -43254,7 +43321,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -43270,7 +43337,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -43278,7 +43345,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -43294,7 +43361,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -43302,7 +43369,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -43318,7 +43385,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -43326,7 +43393,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -43342,7 +43409,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -43350,7 +43417,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -43366,7 +43433,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -43374,7 +43441,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -43390,7 +43457,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } } @@ -43411,7 +43478,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15486 + priority: 15534 } apply_if: "population>=1000000" } @@ -43430,7 +43497,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15486 + priority: 15534 } apply_if: "population>=150000" } @@ -43449,7 +43516,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15486 + priority: 15534 } apply_if: "population>=50000" } @@ -43468,7 +43535,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43487,7 +43554,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43506,7 +43573,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43525,7 +43592,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43544,7 +43611,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43563,7 +43630,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43582,7 +43649,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43601,7 +43668,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43620,7 +43687,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43639,7 +43706,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43658,7 +43725,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43677,7 +43744,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43696,7 +43763,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43718,7 +43785,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15486 + priority: 15534 } apply_if: "population>=1000000" } @@ -43737,7 +43804,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15486 + priority: 15534 } apply_if: "population>=150000" } @@ -43756,7 +43823,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15486 + priority: 15534 } apply_if: "population>=50000" } @@ -43775,7 +43842,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43794,7 +43861,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43813,7 +43880,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43832,7 +43899,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43851,7 +43918,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43870,7 +43937,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43889,7 +43956,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43908,7 +43975,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43927,7 +43994,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43946,7 +44013,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43965,7 +44032,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43984,7 +44051,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44003,7 +44070,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44025,7 +44092,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=1000000" } @@ -44044,7 +44111,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=150000" } @@ -44063,7 +44130,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=50000" } @@ -44082,7 +44149,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44101,7 +44168,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44120,7 +44187,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44139,7 +44206,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44158,7 +44225,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44177,7 +44244,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44196,7 +44263,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44215,7 +44282,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44234,7 +44301,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44253,7 +44320,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44272,7 +44339,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44291,7 +44358,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44310,7 +44377,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44332,7 +44399,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=1000000" } @@ -44351,7 +44418,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=150000" } @@ -44370,7 +44437,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=50000" } @@ -44389,7 +44456,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44408,7 +44475,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44427,7 +44494,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44446,7 +44513,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44465,7 +44532,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44484,7 +44551,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44503,7 +44570,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44522,7 +44589,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44541,7 +44608,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44560,7 +44627,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44579,7 +44646,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44598,7 +44665,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44617,7 +44684,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44639,7 +44706,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=1000000" } @@ -44658,7 +44725,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=150000" } @@ -44677,7 +44744,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=50000" } @@ -44696,7 +44763,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44715,7 +44782,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44734,7 +44801,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44753,7 +44820,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44772,7 +44839,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44791,7 +44858,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44810,7 +44877,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44829,7 +44896,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44848,7 +44915,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44867,7 +44934,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44886,7 +44953,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44905,7 +44972,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44924,7 +44991,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44946,7 +45013,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=1000000" } @@ -44965,7 +45032,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=150000" } @@ -44984,7 +45051,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=50000" } @@ -45003,7 +45070,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45022,7 +45089,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45041,7 +45108,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45060,7 +45127,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45079,7 +45146,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45098,7 +45165,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45117,7 +45184,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45136,7 +45203,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45155,7 +45222,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45174,7 +45241,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45193,7 +45260,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45212,7 +45279,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45231,7 +45298,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45253,7 +45320,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=1000000" } @@ -45272,7 +45339,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=150000" } @@ -45291,7 +45358,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=50000" } @@ -45310,7 +45377,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45329,7 +45396,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45348,7 +45415,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45367,7 +45434,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45386,7 +45453,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45405,7 +45472,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45424,7 +45491,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45443,7 +45510,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45462,7 +45529,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45481,7 +45548,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45500,7 +45567,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45519,7 +45586,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45538,7 +45605,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45950,7 +46017,7 @@ cont { color: 4473924 stroke_color: 1728053247 } - priority: 15441 + priority: 15485 } } element { @@ -45961,7 +46028,7 @@ cont { color: 4473924 stroke_color: 1728053247 } - priority: 15441 + priority: 15485 } } element { @@ -45972,7 +46039,7 @@ cont { color: 4473924 stroke_color: 1728053247 } - priority: 15441 + priority: 15485 } } element { @@ -45983,7 +46050,7 @@ cont { color: 4473924 stroke_color: 1728053247 } - priority: 15441 + priority: 15485 } } element { @@ -45994,7 +46061,7 @@ cont { color: 4473924 stroke_color: 1728053247 } - priority: 15441 + priority: 15485 } } element { @@ -46005,7 +46072,7 @@ cont { color: 4473924 stroke_color: 1728053247 } - priority: 15441 + priority: 15485 } } element { @@ -46016,7 +46083,7 @@ cont { color: 4473924 stroke_color: 1728053247 } - priority: 15441 + priority: 15485 } } } @@ -46534,7 +46601,7 @@ cont { height: 14 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46544,7 +46611,7 @@ cont { height: 14 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46554,7 +46621,7 @@ cont { height: 15 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46564,7 +46631,7 @@ cont { height: 16 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46574,7 +46641,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46584,7 +46651,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46594,7 +46661,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46604,7 +46671,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46614,7 +46681,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46624,7 +46691,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46634,7 +46701,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46644,7 +46711,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46654,7 +46721,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46664,7 +46731,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46674,7 +46741,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46684,7 +46751,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46694,7 +46761,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46704,7 +46771,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46714,7 +46781,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } } @@ -46750,7 +46817,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46760,7 +46827,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46770,7 +46837,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46780,7 +46847,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46790,7 +46857,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46800,7 +46867,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46810,7 +46877,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46820,7 +46887,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46830,7 +46897,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46840,7 +46907,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46850,7 +46917,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46860,7 +46927,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46870,7 +46937,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46880,7 +46947,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46890,7 +46957,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46900,7 +46967,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } } @@ -46913,7 +46980,7 @@ cont { height: 11 color: 9211020 } - priority: 15432 + priority: 15475 } } element { @@ -46929,7 +46996,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15432 + priority: 15475 } } element { @@ -46945,7 +47012,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15432 + priority: 15475 } } element { @@ -46961,7 +47028,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15432 + priority: 15475 } } element { @@ -46977,7 +47044,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15432 + priority: 15475 } } } @@ -46990,7 +47057,7 @@ cont { height: 11 color: 9211020 } - priority: 15432 + priority: 15475 } } element { @@ -47000,7 +47067,7 @@ cont { height: 11 color: 9211020 } - priority: 15432 + priority: 15475 } } element { @@ -47016,7 +47083,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15432 + priority: 15475 } } element { @@ -47032,7 +47099,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15432 + priority: 15475 } } element { @@ -47048,7 +47115,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15432 + priority: 15475 } } element { @@ -47064,7 +47131,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15432 + priority: 15475 } } } @@ -47148,7 +47215,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } apply_if: "population>=40000" } @@ -47165,7 +47232,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } apply_if: "population>=20000" } @@ -47184,7 +47251,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } element { @@ -47202,7 +47269,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } element { @@ -47220,7 +47287,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } element { @@ -47238,7 +47305,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } element { @@ -47256,7 +47323,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } element { @@ -47274,7 +47341,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } element { @@ -47292,7 +47359,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } element { @@ -47310,7 +47377,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } element { @@ -47328,7 +47395,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } element { @@ -47346,7 +47413,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } } @@ -47367,7 +47434,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15459 + priority: 15504 } } element { @@ -47385,7 +47452,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15459 + priority: 15504 } } element { @@ -47403,7 +47470,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15459 + priority: 15504 } } element { @@ -47421,7 +47488,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15459 + priority: 15504 } } element { @@ -47439,7 +47506,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15459 + priority: 15504 } } element { @@ -47457,7 +47524,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15459 + priority: 15504 } } element { @@ -47475,7 +47542,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15459 + priority: 15504 } } element { @@ -47493,7 +47560,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15459 + priority: 15504 } } element { @@ -47511,7 +47578,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15459 + priority: 15504 } } } @@ -47522,7 +47589,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1513 + priority: 1564 join: ROUNDJOIN cap: ROUNDCAP } @@ -47535,7 +47602,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1513 + priority: 1564 join: ROUNDJOIN cap: ROUNDCAP } @@ -47547,7 +47614,7 @@ cont { scale: 17 symbol { name: "power-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -47556,14 +47623,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "power-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -47572,14 +47639,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "power-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -47588,7 +47655,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -47598,7 +47665,7 @@ cont { scale: 17 symbol { name: "power-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -47607,14 +47674,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "power-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -47623,14 +47690,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "power-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -47639,7 +47706,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -47706,34 +47773,180 @@ cont { } } } +cont { + name: "psurface-unpaved_bad" + element { + scale: 14 + lines { + width: 1.4 + color: 16579836 + dashdot { + dd: 2.0 + dd: 1.35 + } + priority: 1000 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.4 + color: 16579836 + dashdot { + dd: 2.0 + dd: 1.35 + } + priority: 1000 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 1.4 + color: 16579836 + dashdot { + dd: 2.0 + dd: 1.35 + } + priority: 1000 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 17 + lines { + width: 1.4 + color: 16579836 + dashdot { + dd: 2.0 + dd: 1.35 + } + priority: 1000 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 18 + lines { + width: 1.4 + color: 16579836 + dashdot { + dd: 2.0 + dd: 1.35 + } + priority: 1000 + join: ROUNDJOIN + cap: BUTTCAP + } + } +} +cont { + name: "psurface-unpaved_good" + element { + scale: 14 + lines { + width: 1.4 + color: 16579836 + dashdot { + dd: 2.0 + dd: 1.35 + } + priority: 1000 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.4 + color: 16579836 + dashdot { + dd: 2.0 + dd: 1.35 + } + priority: 1000 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 1.4 + color: 16579836 + dashdot { + dd: 2.0 + dd: 1.35 + } + priority: 1000 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 17 + lines { + width: 1.4 + color: 16579836 + dashdot { + dd: 2.0 + dd: 1.35 + } + priority: 1000 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 18 + lines { + width: 1.4 + color: 16579836 + dashdot { + dd: 2.0 + dd: 1.35 + } + priority: 1000 + join: ROUNDJOIN + cap: BUTTCAP + } + } +} cont { name: "public_transport-platform" element { scale: 16 area { color: 15591638 - priority: -15883 + priority: -15872 } } element { scale: 17 area { color: 15591638 - priority: -15883 + priority: -15872 } } element { scale: 18 area { color: 15591638 - priority: -15883 + priority: -15872 } } element { scale: 19 area { color: 15591638 - priority: -15883 + priority: -15872 } } } @@ -47748,7 +47961,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47762,7 +47975,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47776,7 +47989,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47790,7 +48003,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47807,7 +48020,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47828,7 +48041,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47849,7 +48062,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47870,7 +48083,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47894,7 +48107,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47908,7 +48121,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47922,7 +48135,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47936,7 +48149,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47953,7 +48166,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47967,7 +48180,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47981,7 +48194,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47995,7 +48208,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -48012,7 +48225,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -48026,7 +48239,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -48040,7 +48253,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -48054,7 +48267,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -48316,7 +48529,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 min_distance: 10 } } @@ -48325,7 +48538,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -48341,7 +48554,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -48349,7 +48562,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -48365,7 +48578,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -48373,7 +48586,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -48389,7 +48602,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -48397,7 +48610,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -48413,7 +48626,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -48421,7 +48634,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -48437,7 +48650,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -48445,7 +48658,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -48461,7 +48674,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -48469,7 +48682,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -48485,7 +48698,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -48493,7 +48706,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -48509,7 +48722,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -48520,7 +48733,7 @@ cont { symbol { name: "railway-crossing" apply_for_type: 1 - priority: 16594 + priority: 16653 } } element { @@ -48528,7 +48741,7 @@ cont { symbol { name: "railway-crossing" apply_for_type: 1 - priority: 16594 + priority: 16653 } } element { @@ -48536,7 +48749,7 @@ cont { symbol { name: "railway-crossing" apply_for_type: 1 - priority: 16594 + priority: 16653 } } element { @@ -48544,7 +48757,7 @@ cont { symbol { name: "railway-crossing" apply_for_type: 1 - priority: 16594 + priority: 16653 } } element { @@ -48552,7 +48765,7 @@ cont { symbol { name: "railway-crossing" apply_for_type: 1 - priority: 16594 + priority: 16653 } } } @@ -48563,7 +48776,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -48573,7 +48786,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -48583,7 +48796,7 @@ cont { lines { width: 1.2 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -48593,7 +48806,7 @@ cont { lines { width: 2.6 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -48604,7 +48817,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48614,7 +48827,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -48625,7 +48838,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48635,7 +48848,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -48646,7 +48859,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48656,7 +48869,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -48667,7 +48880,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48680,7 +48893,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -48690,14 +48903,14 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.0 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -48707,14 +48920,14 @@ cont { lines { width: 1.2 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -48724,21 +48937,21 @@ cont { lines { width: 2.6 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 5.0 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } lines { width: 5.4 color: 8421504 - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -48749,7 +48962,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48759,21 +48972,21 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 6.8 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.2 color: 8421504 - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -48784,7 +48997,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48794,21 +49007,21 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 8421504 - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -48819,7 +49032,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48829,21 +49042,21 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 8421504 - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -48854,7 +49067,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48867,7 +49080,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -48881,14 +49094,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -48902,14 +49115,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.2 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -48923,14 +49136,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 2.6 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -48941,7 +49154,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48955,14 +49168,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -48973,7 +49186,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48987,14 +49200,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49005,7 +49218,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49019,14 +49232,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49037,7 +49250,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49050,7 +49263,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -49060,7 +49273,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -49070,7 +49283,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49080,7 +49293,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49090,7 +49303,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49100,7 +49313,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49113,7 +49326,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -49123,7 +49336,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -49133,7 +49346,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49143,7 +49356,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49153,7 +49366,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49163,7 +49376,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49176,7 +49389,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -49186,7 +49399,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -49196,7 +49409,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49206,7 +49419,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49216,7 +49429,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49226,7 +49439,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49239,7 +49452,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -49249,7 +49462,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49259,7 +49472,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49269,7 +49482,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49279,7 +49492,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49292,7 +49505,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -49302,7 +49515,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49312,7 +49525,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49322,7 +49535,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49332,7 +49545,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49345,7 +49558,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -49355,7 +49568,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49365,7 +49578,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49375,7 +49588,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49385,7 +49598,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49397,28 +49610,28 @@ cont { scale: 16 area { color: 15591638 - priority: -15883 + priority: -15872 } } element { scale: 17 area { color: 15591638 - priority: -15883 + priority: -15872 } } element { scale: 18 area { color: 15591638 - priority: -15883 + priority: -15872 } } element { scale: 19 area { color: 15591638 - priority: -15883 + priority: -15872 } } } @@ -49433,7 +49646,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49447,7 +49660,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49461,7 +49674,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49475,7 +49688,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49492,7 +49705,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49513,7 +49726,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49534,7 +49747,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49555,7 +49768,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49579,7 +49792,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49593,7 +49806,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49607,7 +49820,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49621,7 +49834,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49634,7 +49847,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -49644,7 +49857,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -49654,7 +49867,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -49664,7 +49877,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -49674,7 +49887,7 @@ cont { lines { width: 1.2 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -49684,7 +49897,7 @@ cont { lines { width: 2.6 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49695,7 +49908,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49705,7 +49918,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49716,7 +49929,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49726,7 +49939,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49737,7 +49950,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49747,7 +49960,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49758,7 +49971,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49771,7 +49984,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -49781,7 +49994,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -49791,7 +50004,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -49801,14 +50014,14 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } @@ -49818,14 +50031,14 @@ cont { lines { width: 1.2 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } @@ -49835,21 +50048,21 @@ cont { lines { width: 2.6 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 5.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 5.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -49860,7 +50073,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49870,21 +50083,21 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 6.8 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -49895,7 +50108,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49905,21 +50118,21 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -49930,7 +50143,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49940,21 +50153,21 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -49965,7 +50178,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49978,7 +50191,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -49988,7 +50201,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -49998,7 +50211,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -50008,7 +50221,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -50018,7 +50231,7 @@ cont { lines { width: 1.2 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -50028,7 +50241,7 @@ cont { lines { width: 2.6 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -50039,7 +50252,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -50049,7 +50262,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -50060,7 +50273,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -50070,7 +50283,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -50081,7 +50294,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -50091,7 +50304,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -50102,7 +50315,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -50115,7 +50328,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -50125,7 +50338,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -50135,7 +50348,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -50149,14 +50362,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -50170,14 +50383,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.2 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -50191,14 +50404,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 2.6 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -50209,7 +50422,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -50223,14 +50436,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -50241,7 +50454,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -50255,14 +50468,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -50273,7 +50486,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -50287,14 +50500,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -50305,7 +50518,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -50318,7 +50531,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50326,7 +50539,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50334,7 +50547,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50342,7 +50555,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50350,7 +50563,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50358,7 +50571,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50366,7 +50579,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } } } @@ -50377,7 +50590,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50385,7 +50598,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50393,7 +50606,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50401,7 +50614,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50409,7 +50622,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50417,7 +50630,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50425,7 +50638,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } } } @@ -50436,7 +50649,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50444,7 +50657,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50452,7 +50665,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50460,7 +50673,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50468,7 +50681,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50476,7 +50689,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50484,7 +50697,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } } } @@ -50495,7 +50708,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -50504,7 +50717,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -50521,7 +50734,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50529,7 +50742,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50545,7 +50758,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50553,7 +50766,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50569,7 +50782,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50577,7 +50790,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50593,7 +50806,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50601,7 +50814,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50617,7 +50830,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50625,7 +50838,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50641,7 +50854,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -50652,7 +50865,7 @@ cont { symbol { name: "subway-barcelona-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -50661,7 +50874,7 @@ cont { symbol { name: "subway-barcelona-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -50678,7 +50891,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50686,7 +50899,7 @@ cont { symbol { name: "subway-barcelona-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50702,7 +50915,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50710,7 +50923,7 @@ cont { symbol { name: "subway-barcelona-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50726,7 +50939,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50734,7 +50947,7 @@ cont { symbol { name: "subway-barcelona-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50750,7 +50963,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50758,7 +50971,7 @@ cont { symbol { name: "subway-barcelona-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50774,7 +50987,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50782,7 +50995,7 @@ cont { symbol { name: "subway-barcelona-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50798,7 +51011,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -50809,7 +51022,7 @@ cont { symbol { name: "subway-berlin-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -50818,7 +51031,7 @@ cont { symbol { name: "subway-berlin-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -50835,7 +51048,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50843,7 +51056,7 @@ cont { symbol { name: "subway-berlin-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50859,7 +51072,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50867,7 +51080,7 @@ cont { symbol { name: "subway-berlin-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50883,7 +51096,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50891,7 +51104,7 @@ cont { symbol { name: "subway-berlin-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50907,7 +51120,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50915,7 +51128,7 @@ cont { symbol { name: "subway-berlin-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50931,7 +51144,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50939,7 +51152,7 @@ cont { symbol { name: "subway-berlin-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50955,7 +51168,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -50966,7 +51179,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -50975,7 +51188,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -50992,7 +51205,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51000,7 +51213,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51016,7 +51229,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51024,7 +51237,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51040,7 +51253,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51048,7 +51261,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51064,7 +51277,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51072,7 +51285,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51088,7 +51301,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51096,7 +51309,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51112,7 +51325,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -51123,7 +51336,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -51132,7 +51345,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -51149,7 +51362,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51157,7 +51370,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51173,7 +51386,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51181,7 +51394,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51197,7 +51410,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51205,7 +51418,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51221,7 +51434,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51229,7 +51442,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51245,7 +51458,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51253,7 +51466,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51269,7 +51482,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -51280,7 +51493,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -51289,7 +51502,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -51306,7 +51519,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51314,7 +51527,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51330,7 +51543,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51338,7 +51551,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51354,7 +51567,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51362,7 +51575,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51378,7 +51591,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51386,7 +51599,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51402,7 +51615,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51410,7 +51623,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51426,7 +51639,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -51437,7 +51650,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -51446,7 +51659,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -51463,7 +51676,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51471,7 +51684,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51487,7 +51700,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51495,7 +51708,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51511,7 +51724,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51519,7 +51732,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51535,7 +51748,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51543,7 +51756,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51559,7 +51772,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51567,7 +51780,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51583,7 +51796,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -51594,7 +51807,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -51603,7 +51816,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -51620,7 +51833,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51628,7 +51841,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51644,7 +51857,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51652,7 +51865,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51668,7 +51881,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51676,7 +51889,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51692,7 +51905,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51700,7 +51913,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51716,7 +51929,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51724,7 +51937,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51740,7 +51953,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -51751,7 +51964,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -51760,7 +51973,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -51777,7 +51990,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51785,7 +51998,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51801,7 +52014,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51809,7 +52022,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51825,7 +52038,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51833,7 +52046,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51849,7 +52062,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51857,7 +52070,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51873,7 +52086,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51881,7 +52094,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51897,7 +52110,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -51908,7 +52121,7 @@ cont { symbol { name: "subway-kiev-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -51918,7 +52131,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15918 + priority: 15910 } } element { @@ -51926,7 +52139,7 @@ cont { symbol { name: "subway-kiev-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -51943,7 +52156,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51951,7 +52164,7 @@ cont { symbol { name: "subway-kiev-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51967,7 +52180,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51975,7 +52188,7 @@ cont { symbol { name: "subway-kiev-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51991,15 +52204,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 17 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52013,15 +52226,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 18 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52035,15 +52248,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 19 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52057,7 +52270,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -52068,7 +52281,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -52077,7 +52290,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -52094,7 +52307,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52102,7 +52315,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52118,7 +52331,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52126,7 +52339,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52142,7 +52355,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52150,7 +52363,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52166,7 +52379,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52174,7 +52387,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52190,7 +52403,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52198,7 +52411,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52214,7 +52427,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -52225,7 +52438,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -52234,7 +52447,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -52251,7 +52464,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52259,7 +52472,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52275,7 +52488,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52283,7 +52496,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52299,7 +52512,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52307,7 +52520,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52323,7 +52536,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52331,7 +52544,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52347,7 +52560,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52355,7 +52568,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52371,7 +52584,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -52382,7 +52595,7 @@ cont { symbol { name: "subway-london-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -52391,7 +52604,7 @@ cont { symbol { name: "subway-london-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -52408,7 +52621,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52416,7 +52629,7 @@ cont { symbol { name: "subway-london-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52432,7 +52645,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52440,7 +52653,7 @@ cont { symbol { name: "subway-london-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52456,7 +52669,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52464,7 +52677,7 @@ cont { symbol { name: "subway-london-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52480,7 +52693,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52488,7 +52701,7 @@ cont { symbol { name: "subway-london-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52504,7 +52717,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52512,7 +52725,7 @@ cont { symbol { name: "subway-london-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52528,7 +52741,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -52539,7 +52752,7 @@ cont { symbol { name: "subway-madrid-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -52548,7 +52761,7 @@ cont { symbol { name: "subway-madrid-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -52565,7 +52778,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52573,7 +52786,7 @@ cont { symbol { name: "subway-madrid-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52589,7 +52802,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52597,7 +52810,7 @@ cont { symbol { name: "subway-madrid-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52613,7 +52826,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52621,7 +52834,7 @@ cont { symbol { name: "subway-madrid-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52637,7 +52850,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52645,7 +52858,7 @@ cont { symbol { name: "subway-madrid-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52661,7 +52874,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52669,7 +52882,7 @@ cont { symbol { name: "subway-madrid-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52685,7 +52898,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -52696,7 +52909,7 @@ cont { symbol { name: "subway-minsk-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -52706,7 +52919,7 @@ cont { stroke_color: 1308622847 offset_y: 4 } - priority: 15918 + priority: 15910 } } element { @@ -52714,7 +52927,7 @@ cont { symbol { name: "subway-minsk-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -52731,7 +52944,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52739,7 +52952,7 @@ cont { symbol { name: "subway-minsk-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52755,15 +52968,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 16 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52777,15 +52990,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 17 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52799,15 +53012,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 18 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52821,15 +53034,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 19 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52843,7 +53056,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -52854,7 +53067,7 @@ cont { symbol { name: "subway-moscow-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -52863,7 +53076,7 @@ cont { symbol { name: "subway-moscow-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -52880,7 +53093,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52888,7 +53101,7 @@ cont { symbol { name: "subway-moscow-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -52905,7 +53118,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52913,7 +53126,7 @@ cont { symbol { name: "subway-moscow-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -52930,7 +53143,7 @@ cont { offset_y: 24 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52938,7 +53151,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52954,7 +53167,7 @@ cont { offset_y: 24 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52962,7 +53175,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52978,7 +53191,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52986,7 +53199,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53002,7 +53215,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53010,7 +53223,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53026,7 +53239,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53034,7 +53247,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53050,7 +53263,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -53061,7 +53274,7 @@ cont { symbol { name: "subway-newyork-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -53070,7 +53283,7 @@ cont { symbol { name: "subway-newyork-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -53087,7 +53300,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53095,7 +53308,7 @@ cont { symbol { name: "subway-newyork-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53111,7 +53324,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53119,7 +53332,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53135,7 +53348,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53143,7 +53356,7 @@ cont { symbol { name: "subway-newyork-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53159,7 +53372,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53167,7 +53380,7 @@ cont { symbol { name: "subway-newyork-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53183,7 +53396,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53191,7 +53404,7 @@ cont { symbol { name: "subway-newyork-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53207,7 +53420,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -53218,7 +53431,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -53227,7 +53440,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -53244,7 +53457,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53252,7 +53465,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53268,7 +53481,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53276,7 +53489,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53292,7 +53505,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53300,7 +53513,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53316,7 +53529,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53324,7 +53537,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53340,7 +53553,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53348,7 +53561,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53364,7 +53577,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -53375,7 +53588,7 @@ cont { symbol { name: "subway-paris-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -53384,7 +53597,7 @@ cont { symbol { name: "subway-paris-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -53401,7 +53614,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53409,7 +53622,7 @@ cont { symbol { name: "subway-paris-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53425,7 +53638,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53433,7 +53646,7 @@ cont { symbol { name: "subway-paris-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53449,7 +53662,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53457,7 +53670,7 @@ cont { symbol { name: "subway-paris-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53473,7 +53686,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53481,7 +53694,7 @@ cont { symbol { name: "subway-paris-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53497,7 +53710,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53505,7 +53718,7 @@ cont { symbol { name: "subway-paris-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53521,7 +53734,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -53532,7 +53745,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -53541,7 +53754,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -53558,7 +53771,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53566,7 +53779,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53582,7 +53795,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53590,7 +53803,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53606,7 +53819,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53614,7 +53827,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53630,7 +53843,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53638,7 +53851,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53654,7 +53867,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53662,7 +53875,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53678,7 +53891,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -53689,7 +53902,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -53698,7 +53911,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -53715,7 +53928,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53723,7 +53936,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53739,7 +53952,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53747,7 +53960,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53763,7 +53976,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53771,7 +53984,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53787,7 +54000,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53795,7 +54008,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53811,7 +54024,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53819,7 +54032,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53835,7 +54048,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -53846,7 +54059,7 @@ cont { symbol { name: "subway-rome-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -53855,7 +54068,7 @@ cont { symbol { name: "subway-rome-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -53872,7 +54085,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53880,7 +54093,7 @@ cont { symbol { name: "subway-rome-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53896,7 +54109,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53904,7 +54117,7 @@ cont { symbol { name: "subway-rome-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53920,15 +54133,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 17 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53942,15 +54155,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 18 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53964,15 +54177,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 19 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53986,7 +54199,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -53997,7 +54210,7 @@ cont { symbol { name: "subway-spb-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -54006,7 +54219,7 @@ cont { symbol { name: "subway-spb-s" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54022,7 +54235,7 @@ cont { offset_y: 5 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -54030,7 +54243,7 @@ cont { symbol { name: "subway-spb-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -54047,7 +54260,7 @@ cont { offset_y: 5 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -54055,7 +54268,7 @@ cont { symbol { name: "subway-spb-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -54072,7 +54285,7 @@ cont { offset_y: 24 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -54080,7 +54293,7 @@ cont { symbol { name: "subway-spb-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54096,7 +54309,7 @@ cont { offset_y: 24 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -54104,7 +54317,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54120,7 +54333,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -54128,7 +54341,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54144,7 +54357,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -54152,7 +54365,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54168,7 +54381,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -54176,7 +54389,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54192,7 +54405,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -54203,7 +54416,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -54212,7 +54425,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -54229,7 +54442,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -54237,7 +54450,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54253,7 +54466,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -54261,7 +54474,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54277,7 +54490,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -54285,7 +54498,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54301,7 +54514,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -54309,7 +54522,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54325,7 +54538,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -54333,7 +54546,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54349,7 +54562,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -54360,7 +54573,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -54369,7 +54582,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -54386,7 +54599,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -54394,7 +54607,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54410,7 +54623,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -54418,7 +54631,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54434,7 +54647,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -54442,7 +54655,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54458,7 +54671,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -54466,7 +54679,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54482,7 +54695,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -54490,7 +54703,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54506,7 +54719,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -54527,7 +54740,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54535,7 +54748,7 @@ cont { symbol { name: "subway-entrance-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54551,7 +54764,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54559,7 +54772,7 @@ cont { symbol { name: "subway-entrance-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54575,7 +54788,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54583,7 +54796,7 @@ cont { symbol { name: "subway-entrance-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54599,7 +54812,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -54620,7 +54833,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54628,7 +54841,7 @@ cont { symbol { name: "subway-barcelona-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54644,7 +54857,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54652,7 +54865,7 @@ cont { symbol { name: "subway-barcelona-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54668,7 +54881,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54676,7 +54889,7 @@ cont { symbol { name: "subway-barcelona-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54692,7 +54905,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -54713,7 +54926,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54721,7 +54934,7 @@ cont { symbol { name: "subway-berlin-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54737,7 +54950,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54745,7 +54958,7 @@ cont { symbol { name: "subway-berlin-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54761,7 +54974,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54769,7 +54982,7 @@ cont { symbol { name: "subway-berlin-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54785,7 +54998,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -54806,7 +55019,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54814,7 +55027,7 @@ cont { symbol { name: "subway-kiev-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54830,7 +55043,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54838,7 +55051,7 @@ cont { symbol { name: "subway-kiev-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54854,7 +55067,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54862,7 +55075,7 @@ cont { symbol { name: "subway-kiev-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54878,7 +55091,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -54899,7 +55112,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54907,7 +55120,7 @@ cont { symbol { name: "subway-london-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54923,7 +55136,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54931,7 +55144,7 @@ cont { symbol { name: "subway-london-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54947,7 +55160,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54955,7 +55168,7 @@ cont { symbol { name: "subway-london-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54971,7 +55184,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -54992,7 +55205,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55000,7 +55213,7 @@ cont { symbol { name: "subway-madrid-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55016,7 +55229,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55024,7 +55237,7 @@ cont { symbol { name: "subway-madrid-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55040,7 +55253,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55048,7 +55261,7 @@ cont { symbol { name: "subway-madrid-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55064,7 +55277,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -55085,7 +55298,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55093,7 +55306,7 @@ cont { symbol { name: "subway-minsk-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55109,7 +55322,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55117,7 +55330,7 @@ cont { symbol { name: "subway-minsk-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55133,7 +55346,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55141,7 +55354,7 @@ cont { symbol { name: "subway-minsk-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55157,7 +55370,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -55168,7 +55381,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55184,7 +55397,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55192,7 +55405,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55208,7 +55421,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55216,7 +55429,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55232,7 +55445,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55240,7 +55453,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55256,7 +55469,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -55277,7 +55490,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55285,7 +55498,7 @@ cont { symbol { name: "subway-newyork-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55301,7 +55514,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55309,7 +55522,7 @@ cont { symbol { name: "subway-newyork-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55325,7 +55538,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55333,7 +55546,7 @@ cont { symbol { name: "subway-newyork-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55349,7 +55562,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -55370,7 +55583,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55378,7 +55591,7 @@ cont { symbol { name: "subway-paris-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55394,7 +55607,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55402,7 +55615,7 @@ cont { symbol { name: "subway-paris-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55418,7 +55631,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55426,7 +55639,7 @@ cont { symbol { name: "subway-paris-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55442,7 +55655,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -55463,7 +55676,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55471,7 +55684,7 @@ cont { symbol { name: "subway-rome-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55487,7 +55700,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55495,7 +55708,7 @@ cont { symbol { name: "subway-rome-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55511,7 +55724,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55519,7 +55732,7 @@ cont { symbol { name: "subway-rome-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55535,7 +55748,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -55546,7 +55759,7 @@ cont { symbol { name: "subway-spb-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55562,7 +55775,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55570,7 +55783,7 @@ cont { symbol { name: "subway-spb-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55586,7 +55799,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55594,7 +55807,7 @@ cont { symbol { name: "subway-spb-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55610,7 +55823,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55618,7 +55831,7 @@ cont { symbol { name: "subway-spb-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55634,7 +55847,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -55645,7 +55858,7 @@ cont { lines { width: 0.6 color: 1719302778 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -55655,7 +55868,7 @@ cont { lines { width: 0.6 color: 1719302778 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -55665,7 +55878,7 @@ cont { lines { width: 0.7 color: 863664762 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -55675,7 +55888,7 @@ cont { lines { width: 0.8 color: 444234362 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55685,7 +55898,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55695,7 +55908,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55705,7 +55918,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55718,7 +55931,7 @@ cont { lines { width: 0.6 color: 1719302778 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -55728,7 +55941,7 @@ cont { lines { width: 0.6 color: 1719302778 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -55738,7 +55951,7 @@ cont { lines { width: 0.7 color: 863664762 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -55748,7 +55961,7 @@ cont { lines { width: 0.8 color: 444234362 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55758,7 +55971,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55768,7 +55981,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55778,7 +55991,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55791,7 +56004,7 @@ cont { lines { width: 0.6 color: 1719302778 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -55801,7 +56014,7 @@ cont { lines { width: 0.6 color: 1719302778 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -55811,7 +56024,7 @@ cont { lines { width: 0.7 color: 863664762 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -55821,7 +56034,7 @@ cont { lines { width: 0.8 color: 444234362 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55831,7 +56044,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55841,7 +56054,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55851,7 +56064,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55864,28 +56077,28 @@ cont { symbol { name: "tram-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { scale: 15 symbol { name: "tram-m" - priority: 16657 + priority: 16722 } } element { scale: 16 symbol { name: "tram-m" - priority: 16657 + priority: 16722 } } element { scale: 17 symbol { name: "tram-l" - priority: 16657 + priority: 16722 } caption { primary { @@ -55901,14 +56114,14 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { scale: 18 symbol { name: "tram-l" - priority: 16657 + priority: 16722 } caption { primary { @@ -55924,14 +56137,14 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { scale: 19 symbol { name: "tram-l" - priority: 16657 + priority: 16722 } caption { primary { @@ -55947,7 +56160,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -55958,7 +56171,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -55968,7 +56181,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -55978,7 +56191,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -55988,7 +56201,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -55998,7 +56211,7 @@ cont { lines { width: 1.2 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -56008,7 +56221,7 @@ cont { lines { width: 2.6 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -56019,7 +56232,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -56029,7 +56242,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -56040,7 +56253,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -56050,7 +56263,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -56061,7 +56274,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -56071,7 +56284,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -56082,7 +56295,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -56095,7 +56308,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -56105,7 +56318,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -56115,7 +56328,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -56125,14 +56338,14 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.0 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -56142,14 +56355,14 @@ cont { lines { width: 1.2 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -56159,21 +56372,21 @@ cont { lines { width: 2.6 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 5.0 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } lines { width: 5.4 color: 8421504 - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -56184,7 +56397,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -56194,21 +56407,21 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 6.8 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.2 color: 8421504 - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -56219,7 +56432,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -56229,21 +56442,21 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 8421504 - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -56254,7 +56467,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -56264,21 +56477,21 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 8421504 - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -56289,7 +56502,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -56302,7 +56515,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -56312,7 +56525,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -56322,7 +56535,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -56336,14 +56549,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -56357,14 +56570,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.2 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -56378,14 +56591,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 2.6 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -56396,7 +56609,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -56410,14 +56623,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -56428,7 +56641,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -56442,14 +56655,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -56460,7 +56673,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -56474,14 +56687,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -56492,7 +56705,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -56509,7 +56722,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: BEVELJOIN cap: BUTTCAP } @@ -56518,7 +56731,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56530,7 +56743,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: BEVELJOIN cap: BUTTCAP } @@ -56539,7 +56752,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56551,7 +56764,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: BEVELJOIN cap: BUTTCAP } @@ -56560,7 +56773,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56572,7 +56785,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: BUTTCAP } @@ -56581,7 +56794,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56593,7 +56806,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: BUTTCAP } @@ -56602,7 +56815,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56614,7 +56827,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: BUTTCAP } @@ -56623,7 +56836,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56635,7 +56848,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56644,7 +56857,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56656,7 +56869,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56665,7 +56878,7 @@ cont { height: 10 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56677,7 +56890,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56686,7 +56899,7 @@ cont { height: 10 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56698,7 +56911,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56707,7 +56920,7 @@ cont { height: 10 color: 4495803 } - priority: 16171 + priority: 16188 } } } @@ -56722,7 +56935,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: BEVELJOIN cap: BUTTCAP } @@ -56731,7 +56944,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56743,7 +56956,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: BEVELJOIN cap: BUTTCAP } @@ -56752,7 +56965,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56764,7 +56977,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: BEVELJOIN cap: BUTTCAP } @@ -56773,7 +56986,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56785,7 +56998,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: BUTTCAP } @@ -56794,7 +57007,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56806,7 +57019,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: BUTTCAP } @@ -56815,7 +57028,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56827,7 +57040,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: BUTTCAP } @@ -56836,7 +57049,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56848,7 +57061,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56857,7 +57070,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56869,7 +57082,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56878,7 +57091,7 @@ cont { height: 10 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56890,7 +57103,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56899,7 +57112,7 @@ cont { height: 10 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56911,7 +57124,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56920,7 +57133,7 @@ cont { height: 10 color: 4495803 } - priority: 16171 + priority: 16188 } } } @@ -56935,7 +57148,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: BEVELJOIN cap: BUTTCAP } @@ -56944,7 +57157,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56956,7 +57169,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: BEVELJOIN cap: BUTTCAP } @@ -56965,7 +57178,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56977,7 +57190,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: BEVELJOIN cap: BUTTCAP } @@ -56986,7 +57199,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56998,7 +57211,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: BUTTCAP } @@ -57007,7 +57220,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -57019,7 +57232,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: BUTTCAP } @@ -57028,7 +57241,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -57040,7 +57253,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: BUTTCAP } @@ -57049,7 +57262,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -57061,7 +57274,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -57070,7 +57283,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -57082,7 +57295,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -57091,7 +57304,7 @@ cont { height: 10 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -57103,7 +57316,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -57112,7 +57325,7 @@ cont { height: 10 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -57124,7 +57337,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -57133,7 +57346,7 @@ cont { height: 10 color: 4495803 } - priority: 16171 + priority: 16188 } } } @@ -57143,7 +57356,7 @@ cont { scale: 16 symbol { name: "shop-m" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57152,14 +57365,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57168,14 +57381,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57184,14 +57397,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57200,7 +57413,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57209,8 +57422,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "alcohol-m" + priority: 16594 min_distance: 10 } caption { @@ -57219,14 +57432,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "alcohol-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57235,14 +57448,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "alcohol-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57251,14 +57464,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "alcohol-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57267,7 +57480,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57276,8 +57489,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "bakery-m" + priority: 16594 min_distance: 10 } caption { @@ -57286,14 +57499,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "bakery-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57302,14 +57515,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "bakery-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57318,14 +57531,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "bakery-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57334,7 +57547,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57343,8 +57556,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "beauty-m" + priority: 16594 min_distance: 10 } caption { @@ -57353,14 +57566,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "beauty-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57369,14 +57582,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "beauty-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57385,14 +57598,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "beauty-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57401,7 +57614,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57410,8 +57623,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "alcohol-m" + priority: 16594 min_distance: 10 } caption { @@ -57420,14 +57633,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "alcohol-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57436,14 +57649,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "alcohol-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57452,14 +57665,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "alcohol-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57468,7 +57681,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57477,8 +57690,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "shop-bicycle-m" + priority: 16594 min_distance: 10 } caption { @@ -57487,14 +57700,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "shop-bicycle-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57503,14 +57716,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "shop-bicycle-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57519,14 +57732,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "shop-bicycle-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57535,7 +57748,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57544,8 +57757,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "bookmaker-m" + priority: 16594 min_distance: 10 } caption { @@ -57554,14 +57767,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "bookmaker-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57570,14 +57783,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "bookmaker-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57586,14 +57799,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "bookmaker-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57602,7 +57815,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57611,8 +57824,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "book-shop-m" + priority: 16594 min_distance: 10 } caption { @@ -57621,14 +57834,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "book-shop-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57637,14 +57850,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "book-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57653,14 +57866,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "book-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57669,7 +57882,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57678,8 +57891,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "butcher-m" + priority: 16594 min_distance: 10 } caption { @@ -57688,14 +57901,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "butcher-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57704,14 +57917,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "butcher-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57720,14 +57933,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "butcher-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57736,7 +57949,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57745,8 +57958,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "car_shop-m" + priority: 16594 min_distance: 10 } caption { @@ -57755,14 +57968,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "car_shop-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57771,14 +57984,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "car_shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57787,14 +58000,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "car_shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57803,7 +58016,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57812,8 +58025,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "car-part-m" + priority: 16594 min_distance: 10 } caption { @@ -57822,14 +58035,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "car-part-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57838,14 +58051,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "car-part-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57854,14 +58067,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "car-part-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57870,7 +58083,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57879,8 +58092,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "car-repair-m" + priority: 16594 min_distance: 10 } caption { @@ -57889,14 +58102,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "car-repair-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57905,14 +58118,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "car-repair-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57921,14 +58134,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "car-repair-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57937,7 +58150,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57947,7 +58160,7 @@ cont { scale: 15 symbol { name: "car-repair-s" - priority: 16594 + priority: 16653 min_distance: 20 } caption { @@ -57962,8 +58175,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16594 + name: "car-repair-m" + priority: 16653 min_distance: 10 } caption { @@ -57979,7 +58192,7 @@ cont { scale: 17 symbol { name: "car-repair-l" - priority: 16594 + priority: 16653 min_distance: 24 } caption { @@ -57988,14 +58201,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "car-repair-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -58004,14 +58217,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "car-repair-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -58020,7 +58233,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -58029,8 +58242,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "chemist-m" + priority: 16594 min_distance: 10 } caption { @@ -58039,14 +58252,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "chemist-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58055,14 +58268,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "chemist-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58071,14 +58284,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "chemist-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58087,7 +58300,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58096,8 +58309,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "clothes-m" + priority: 16594 min_distance: 10 } caption { @@ -58106,14 +58319,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "clothes-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58122,14 +58335,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "clothes-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58138,14 +58351,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "clothes-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58154,7 +58367,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58164,7 +58377,7 @@ cont { scale: 16 symbol { name: "shop-m" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58173,14 +58386,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58189,14 +58402,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58205,14 +58418,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58221,7 +58434,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58230,8 +58443,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "computer-m" + priority: 16594 min_distance: 10 } caption { @@ -58240,14 +58453,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "computer-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58256,14 +58469,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "computer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58272,14 +58485,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "computer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58288,7 +58501,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58297,8 +58510,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "sweets-m" + priority: 16594 min_distance: 10 } caption { @@ -58307,14 +58520,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "sweets-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58323,14 +58536,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "sweets-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58339,14 +58552,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "sweets-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58355,7 +58568,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58364,8 +58577,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "grocery-m" + priority: 16594 min_distance: 10 } caption { @@ -58374,14 +58587,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "grocery-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58390,14 +58603,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "grocery-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58406,14 +58619,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "grocery-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58422,7 +58635,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58431,8 +58644,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "copyshop-m" + priority: 16594 min_distance: 10 } caption { @@ -58441,14 +58654,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "copyshop-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58457,14 +58670,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "copyshop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58473,14 +58686,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "copyshop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58489,7 +58702,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58498,8 +58711,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "beauty-m" + priority: 16594 min_distance: 10 } caption { @@ -58508,14 +58721,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "beauty-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58524,14 +58737,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "beauty-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58540,14 +58753,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "beauty-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58556,7 +58769,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58565,8 +58778,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "department_store-m" + priority: 16594 min_distance: 10 } caption { @@ -58575,14 +58788,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "department_store-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58591,14 +58804,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "department_store-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58607,14 +58820,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "department_store-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58623,7 +58836,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58632,8 +58845,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "doityourself-m" + priority: 16594 min_distance: 10 } caption { @@ -58642,14 +58855,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "doityourself-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58658,14 +58871,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "doityourself-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58674,14 +58887,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "doityourself-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58690,7 +58903,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58699,8 +58912,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "laundry-m" + priority: 16594 min_distance: 10 } caption { @@ -58709,14 +58922,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "laundry-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58725,14 +58938,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "laundry-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58741,14 +58954,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "laundry-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58757,7 +58970,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58766,8 +58979,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "electronics-m" + priority: 16594 min_distance: 10 } caption { @@ -58776,14 +58989,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "electronics-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58792,14 +59005,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "electronics-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58808,14 +59021,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "electronics-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58824,7 +59037,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58833,8 +59046,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "florist-m" + priority: 16594 min_distance: 10 } caption { @@ -58843,14 +59056,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "florist-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58859,14 +59072,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "florist-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58875,14 +59088,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "florist-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58891,7 +59104,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58900,8 +59113,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "furniture-m" + priority: 16594 min_distance: 10 } caption { @@ -58910,14 +59123,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "furniture-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58926,14 +59139,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "furniture-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58942,14 +59155,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "furniture-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58958,7 +59171,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58967,8 +59180,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "garden_center-m" + priority: 16594 min_distance: 10 } caption { @@ -58977,14 +59190,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "garden_center-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58993,14 +59206,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "garden_center-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59009,14 +59222,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "garden_center-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59025,7 +59238,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59034,8 +59247,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "gift-m" + priority: 16594 min_distance: 10 } caption { @@ -59044,14 +59257,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "gift-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59060,14 +59273,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "gift-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59076,14 +59289,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "gift-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59092,7 +59305,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59101,8 +59314,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "greengrocer-m" + priority: 16594 min_distance: 10 } caption { @@ -59111,14 +59324,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "greengrocer-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59127,14 +59340,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "greengrocer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59143,14 +59356,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "greengrocer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59159,7 +59372,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59168,8 +59381,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "hairdresser-m" + priority: 16594 min_distance: 10 } caption { @@ -59178,14 +59391,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "hairdresser-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59194,14 +59407,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "hairdresser-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59210,14 +59423,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hairdresser-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59226,7 +59439,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59235,8 +59448,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "doityourself-m" + priority: 16594 min_distance: 10 } caption { @@ -59245,14 +59458,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "doityourself-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59261,14 +59474,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "doityourself-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59277,14 +59490,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "doityourself-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59293,7 +59506,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59302,8 +59515,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "jewelry-m" + priority: 16594 min_distance: 10 } caption { @@ -59312,14 +59525,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "jewelry-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59328,14 +59541,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "jewelry-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59344,14 +59557,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "jewelry-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59360,7 +59573,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59369,8 +59582,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "kiosk-m" + priority: 16594 min_distance: 10 } caption { @@ -59379,14 +59592,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "kiosk-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59395,14 +59608,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "kiosk-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59411,14 +59624,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "kiosk-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59427,7 +59640,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59436,8 +59649,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "laundry-m" + priority: 16594 min_distance: 10 } caption { @@ -59446,14 +59659,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "laundry-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59462,14 +59675,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "laundry-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59478,14 +59691,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "laundry-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59494,7 +59707,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59504,7 +59717,7 @@ cont { scale: 14 symbol { name: "shop-s" - priority: 16936 + priority: 16930 min_distance: 16 } caption { @@ -59513,14 +59726,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15936 + priority: 15930 } } element { scale: 15 symbol { name: "shop-m" - priority: 16936 + priority: 16930 min_distance: 16 } caption { @@ -59529,14 +59742,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15936 + priority: 15930 } } element { scale: 16 symbol { name: "shop-m" - priority: 16936 + priority: 16930 min_distance: 10 } caption { @@ -59545,14 +59758,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15936 + priority: 15930 } } element { scale: 17 symbol { name: "shop-l" - priority: 16936 + priority: 16930 min_distance: 10 } caption { @@ -59561,14 +59774,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15936 + priority: 15930 } } element { scale: 18 symbol { name: "shop-l" - priority: 16936 + priority: 16930 min_distance: 10 } caption { @@ -59577,14 +59790,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15936 + priority: 15930 } } element { scale: 19 symbol { name: "shop-l" - priority: 16936 + priority: 16930 min_distance: 10 } caption { @@ -59593,7 +59806,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15936 + priority: 15930 } } } @@ -59602,8 +59815,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "mobile_phone-m" + priority: 16594 min_distance: 10 } caption { @@ -59612,14 +59825,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "mobile_phone-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59628,14 +59841,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "mobile_phone-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59644,14 +59857,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "mobile_phone-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59660,7 +59873,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59669,8 +59882,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "optician-m" + priority: 16594 min_distance: 10 } caption { @@ -59679,14 +59892,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "optician-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59695,14 +59908,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "optician-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59711,14 +59924,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "optician-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59727,7 +59940,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59736,8 +59949,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "outdoor-shop-m" + priority: 16594 min_distance: 10 } caption { @@ -59746,14 +59959,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "outdoor-shop-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59762,14 +59975,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "outdoor-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59778,14 +59991,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "outdoor-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59794,7 +60007,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59803,8 +60016,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "petshop-m" + priority: 16594 min_distance: 10 } caption { @@ -59813,14 +60026,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "petshop-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59829,14 +60042,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "petshop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59845,14 +60058,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "petshop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59861,7 +60074,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59870,8 +60083,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "photo-shop-m" + priority: 16594 min_distance: 10 } caption { @@ -59880,14 +60093,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "photo-shop-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59896,14 +60109,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "photo-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59912,14 +60125,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "photo-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59928,7 +60141,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59937,8 +60150,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "seafood-shop-m" + priority: 16594 min_distance: 10 } caption { @@ -59947,14 +60160,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "seafood-shop-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59963,14 +60176,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "seafood-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59979,14 +60192,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "seafood-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59995,7 +60208,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -60004,8 +60217,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "shoes-m" + priority: 16594 min_distance: 10 } caption { @@ -60014,14 +60227,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "shoes-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -60030,14 +60243,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "shoes-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60046,14 +60259,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "shoes-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60062,7 +60275,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -60071,8 +60284,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "sports-m" + priority: 16594 min_distance: 10 } caption { @@ -60081,14 +60294,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "sports-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -60097,14 +60310,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "sports-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60113,14 +60326,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "sports-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60129,7 +60342,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -60139,7 +60352,7 @@ cont { scale: 14 symbol { name: "shop-m" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -60148,14 +60361,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 15 symbol { name: "shop-m" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -60164,14 +60377,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 16 symbol { name: "shop-m" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -60180,14 +60393,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 17 symbol { name: "shop-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -60196,14 +60409,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "shop-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -60212,14 +60425,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "shop-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -60228,7 +60441,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -60238,7 +60451,7 @@ cont { scale: 16 symbol { name: "shop-m" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60247,14 +60460,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60263,14 +60476,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60279,14 +60492,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60295,7 +60508,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -60304,8 +60517,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "ticket-shop-m" + priority: 16594 min_distance: 10 } caption { @@ -60314,14 +60527,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "ticket-shop-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -60330,14 +60543,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "ticket-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60346,14 +60559,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "ticket-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60362,7 +60575,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -60371,8 +60584,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "toys-m" + priority: 16594 min_distance: 10 } caption { @@ -60381,14 +60594,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "toys-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -60397,14 +60610,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "toys-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60413,14 +60626,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "toys-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60429,7 +60642,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -60439,7 +60652,7 @@ cont { scale: 16 symbol { name: "shop-m" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60448,14 +60661,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60464,14 +60677,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60480,14 +60693,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60496,7 +60709,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -60505,8 +60718,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "car-repair-m" + priority: 16594 min_distance: 10 } caption { @@ -60515,14 +60728,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "car-repair-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -60531,14 +60744,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "car-repair-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60547,14 +60760,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "car-repair-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60563,7 +60776,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -60572,8 +60785,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "alcohol-m" + priority: 16594 min_distance: 10 } caption { @@ -60582,14 +60795,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "alcohol-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -60598,14 +60811,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "alcohol-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60614,14 +60827,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "alcohol-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60630,45 +60843,560 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } +cont { + name: "sponsored-booking" + element { + scale: 14 + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15782 + } + apply_if: "rating>=5" + } + element { + scale: 14 + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15792 + } + apply_if: "rating>=6" + } + element { + scale: 14 + symbol { + name: "hotel-s" + apply_for_type: 1 + priority: 16801 + min_distance: 24 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 6 + } + priority: 15801 + } + apply_if: "rating>=7" + } + element { + scale: 14 + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15811 + } + apply_if: "rating>=8" + } + element { + scale: 14 + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15821 + } + apply_if: "rating>=9" + } + element { + scale: 15 + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15782 + } + apply_if: "rating>=5" + } + element { + scale: 15 + symbol { + name: "hotel-m" + apply_for_type: 1 + priority: 16792 + min_distance: 32 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15792 + } + apply_if: "rating>=6" + } + element { + scale: 15 + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15801 + } + apply_if: "rating>=7" + } + element { + scale: 15 + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15811 + } + apply_if: "rating>=8" + } + element { + scale: 15 + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15821 + } + apply_if: "rating>=9" + } + element { + scale: 16 + symbol { + name: "hotel-m" + apply_for_type: 1 + priority: 16782 + min_distance: 24 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15782 + } + apply_if: "rating>=5" + } + element { + scale: 16 + symbol { + name: "hotel-m" + apply_for_type: 1 + priority: 16792 + min_distance: 24 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15792 + } + apply_if: "rating>=6" + } + element { + scale: 16 + symbol { + name: "hotel-m" + apply_for_type: 1 + priority: 16801 + min_distance: 24 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15801 + } + apply_if: "rating>=7" + } + element { + scale: 16 + symbol { + name: "hotel-m" + apply_for_type: 1 + priority: 16811 + min_distance: 24 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15811 + } + apply_if: "rating>=8" + } + element { + scale: 16 + symbol { + name: "hotel-m" + apply_for_type: 1 + priority: 16821 + min_distance: 24 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15821 + } + apply_if: "rating>=9" + } + element { + scale: 17 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16782 + min_distance: 16 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15782 + } + apply_if: "rating>=5" + } + element { + scale: 17 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16792 + min_distance: 16 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15792 + } + apply_if: "rating>=6" + } + element { + scale: 17 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16801 + min_distance: 16 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15801 + } + apply_if: "rating>=7" + } + element { + scale: 17 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16811 + min_distance: 16 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15811 + } + apply_if: "rating>=8" + } + element { + scale: 17 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16821 + min_distance: 16 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15821 + } + apply_if: "rating>=9" + } + element { + scale: 18 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16782 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15782 + } + apply_if: "rating>=5" + } + element { + scale: 18 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16792 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15792 + } + apply_if: "rating>=6" + } + element { + scale: 18 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16801 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15801 + } + apply_if: "rating>=7" + } + element { + scale: 18 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16811 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15811 + } + apply_if: "rating>=8" + } + element { + scale: 18 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16821 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15821 + } + apply_if: "rating>=9" + } + element { + scale: 19 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16782 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15782 + } + apply_if: "rating>=5" + } + element { + scale: 19 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16792 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15792 + } + apply_if: "rating>=6" + } + element { + scale: 19 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16801 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15801 + } + apply_if: "rating>=7" + } + element { + scale: 19 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16811 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15811 + } + apply_if: "rating>=8" + } + element { + scale: 19 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16821 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15821 + } + apply_if: "rating>=9" + } +} cont { name: "sponsored-tinkoff" element { scale: 14 symbol { name: "atm-tinkoff-shield-l" - priority: 16576 + priority: 16633 } } element { scale: 15 symbol { name: "atm-tinkoff-shield-l" - priority: 16576 + priority: 16633 } } element { scale: 16 symbol { name: "atm-tinkoff-shield-l" - priority: 16576 + priority: 16633 } } element { scale: 17 symbol { name: "atm-tinkoff-shield-l" - priority: 16576 + priority: 16633 } } element { scale: 18 symbol { name: "atm-tinkoff-shield-l" - priority: 16576 + priority: 16633 } caption { primary { @@ -60676,14 +61404,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15576 + priority: 15633 } } element { scale: 19 symbol { name: "atm-tinkoff-shield-l" - priority: 16576 + priority: 16633 } caption { primary { @@ -60691,7 +61419,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15576 + priority: 15633 } } } @@ -60705,7 +61433,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -60713,7 +61441,7 @@ cont { symbol { name: "america-football-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -60721,7 +61449,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15558 + priority: 15613 } } element { @@ -60729,7 +61457,7 @@ cont { symbol { name: "america-football-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -60737,7 +61465,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15558 + priority: 15613 } } } @@ -60747,7 +61475,7 @@ cont { scale: 17 symbol { name: "archery-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60756,14 +61484,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "archery-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -60772,14 +61500,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } element { scale: 19 symbol { name: "archery-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -60788,7 +61516,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } } @@ -60802,7 +61530,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -60810,7 +61538,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -60818,7 +61546,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15558 + priority: 15613 } } element { @@ -60826,7 +61554,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -60834,7 +61562,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15558 + priority: 15613 } } } @@ -60844,7 +61572,7 @@ cont { scale: 17 symbol { name: "australian-football-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60853,14 +61581,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "australian-football-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -60869,14 +61597,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } element { scale: 19 symbol { name: "australian-football-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -60885,7 +61613,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } } @@ -60899,7 +61627,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -60907,7 +61635,7 @@ cont { symbol { name: "baseball-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -60915,7 +61643,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15558 + priority: 15613 } } element { @@ -60923,7 +61651,7 @@ cont { symbol { name: "baseball-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -60931,7 +61659,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15558 + priority: 15613 } } } @@ -60945,7 +61673,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -60953,7 +61681,7 @@ cont { symbol { name: "basketball-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -60961,7 +61689,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15558 + priority: 15613 } } element { @@ -60969,7 +61697,7 @@ cont { symbol { name: "basketball-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -60977,7 +61705,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15558 + priority: 15613 } } } @@ -60987,7 +61715,7 @@ cont { scale: 17 symbol { name: "bowls-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60996,14 +61724,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "bowls-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -61012,14 +61740,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } element { scale: 19 symbol { name: "bowls-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -61028,7 +61756,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } } @@ -61038,7 +61766,7 @@ cont { scale: 17 symbol { name: "cricket-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61047,14 +61775,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "cricket-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -61063,14 +61791,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } element { scale: 19 symbol { name: "cricket-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -61079,7 +61807,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } } @@ -61089,7 +61817,7 @@ cont { scale: 17 symbol { name: "curling-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61098,14 +61826,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "curling-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -61114,14 +61842,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } element { scale: 19 symbol { name: "curling-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -61130,7 +61858,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } } @@ -61140,7 +61868,7 @@ cont { scale: 17 symbol { name: "diving-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61149,14 +61877,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "diving-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -61165,14 +61893,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } element { scale: 19 symbol { name: "diving-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -61181,7 +61909,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } } @@ -61191,7 +61919,7 @@ cont { scale: 16 symbol { name: "equestrian-m" - priority: 16540 + priority: 16594 min_distance: 30 } } @@ -61199,7 +61927,7 @@ cont { scale: 17 symbol { name: "equestrian-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -61208,14 +61936,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "equestrian-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -61224,14 +61952,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "equestrian-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -61240,7 +61968,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -61250,7 +61978,7 @@ cont { scale: 17 symbol { name: "soccer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61259,14 +61987,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "soccer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61275,14 +62003,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "soccer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61291,7 +62019,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -61305,7 +62033,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -61313,7 +62041,7 @@ cont { symbol { name: "golf-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -61321,7 +62049,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15558 + priority: 15613 } } element { @@ -61329,7 +62057,7 @@ cont { symbol { name: "golf-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -61337,7 +62065,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15558 + priority: 15613 } } } @@ -61351,7 +62079,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -61359,7 +62087,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -61367,7 +62095,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15558 + priority: 15613 } } element { @@ -61375,7 +62103,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -61383,7 +62111,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15558 + priority: 15613 } } } @@ -61397,7 +62125,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -61408,7 +62136,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -61419,7 +62147,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -61429,12 +62157,12 @@ cont { scale: 17 area { color: 13749671 - priority: -15460 + priority: -15406 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61443,19 +62171,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 area { color: 13749671 - priority: -15460 + priority: -15406 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61464,19 +62192,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 area { color: 13749671 - priority: -15460 + priority: -15406 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61485,7 +62213,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -61495,7 +62223,7 @@ cont { scale: 17 symbol { name: "diving-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61504,14 +62232,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "diving-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -61520,14 +62248,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } element { scale: 19 symbol { name: "diving-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -61536,7 +62264,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } } @@ -61546,7 +62274,7 @@ cont { scale: 17 symbol { name: "archery-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61555,14 +62283,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "archery-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -61571,14 +62299,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } element { scale: 19 symbol { name: "archery-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -61587,7 +62315,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } } @@ -61601,7 +62329,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -61612,7 +62340,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -61623,7 +62351,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -61633,18 +62361,18 @@ cont { scale: 16 area { color: 13749671 - priority: -15460 + priority: -15406 } } element { scale: 17 area { color: 13749671 - priority: -15460 + priority: -15406 } symbol { name: "soccer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61653,18 +62381,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 area { color: 13749671 - priority: -15460 + priority: -15406 } symbol { name: "soccer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61673,18 +62401,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 area { color: 13749671 - priority: -15460 + priority: -15406 } symbol { name: "soccer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61693,7 +62421,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -61707,7 +62435,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -61715,7 +62443,7 @@ cont { symbol { name: "swimming-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -61723,7 +62451,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15558 + priority: 15613 } } element { @@ -61731,7 +62459,7 @@ cont { symbol { name: "swimming-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -61739,7 +62467,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15558 + priority: 15613 } } } @@ -61750,7 +62478,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -61759,7 +62487,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { @@ -61767,7 +62495,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -61776,7 +62504,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { @@ -61784,7 +62512,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -61793,41 +62521,17 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } cont { name: "tourism-alpine_hut" - element { - scale: 14 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15684 - } - } - element { - scale: 15 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15684 - } - } element { scale: 16 symbol { name: "alpine_hut-m" - priority: 16684 + priority: 16752 min_distance: 24 } caption { @@ -61837,14 +62541,14 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15684 + priority: 15752 } } element { scale: 17 symbol { name: "alpine_hut-l" - priority: 16684 + priority: 16752 min_distance: 16 } caption { @@ -61854,14 +62558,14 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15684 + priority: 15752 } } element { scale: 18 symbol { name: "alpine_hut-l" - priority: 16684 + priority: 16752 } caption { primary { @@ -61870,14 +62574,14 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15684 + priority: 15752 } } element { scale: 19 symbol { name: "alpine_hut-l" - priority: 16684 + priority: 16752 } caption { primary { @@ -61886,41 +62590,17 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15684 + priority: 15752 } } } cont { name: "tourism-apartment" - element { - scale: 14 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15675 - } - } - element { - scale: 15 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15675 - } - } element { scale: 16 symbol { name: "motel-m" - priority: 16675 + priority: 16742 min_distance: 24 } caption { @@ -61930,14 +62610,14 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15675 + priority: 15742 } } element { scale: 17 symbol { name: "motel-l" - priority: 16675 + priority: 16742 min_distance: 16 } caption { @@ -61947,14 +62627,14 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15675 + priority: 15742 } } element { scale: 18 symbol { name: "motel-l" - priority: 16675 + priority: 16742 } caption { primary { @@ -61963,14 +62643,14 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15675 + priority: 15742 } } element { scale: 19 symbol { name: "motel-l" - priority: 16675 + priority: 16742 } caption { primary { @@ -61979,7 +62659,7 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15675 + priority: 15742 } } } @@ -61990,7 +62670,7 @@ cont { symbol { name: "tourism-m" apply_for_type: 1 - priority: 16846 + priority: 16831 min_distance: 8 } caption { @@ -61999,7 +62679,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15846 + priority: 15831 } } element { @@ -62007,7 +62687,7 @@ cont { symbol { name: "tourism-m" apply_for_type: 1 - priority: 16846 + priority: 16831 min_distance: 28 } caption { @@ -62016,7 +62696,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15846 + priority: 15831 } } element { @@ -62024,7 +62704,7 @@ cont { symbol { name: "tourism-l" apply_for_type: 1 - priority: 16846 + priority: 16831 min_distance: 24 } caption { @@ -62033,7 +62713,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15846 + priority: 15831 } } element { @@ -62041,7 +62721,7 @@ cont { symbol { name: "tourism-l" apply_for_type: 1 - priority: 16846 + priority: 16831 min_distance: 24 } caption { @@ -62050,7 +62730,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15846 + priority: 15831 } } element { @@ -62058,7 +62738,7 @@ cont { symbol { name: "tourism-l" apply_for_type: 1 - priority: 16846 + priority: 16831 min_distance: 24 } caption { @@ -62067,7 +62747,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15846 + priority: 15831 } } } @@ -62077,7 +62757,7 @@ cont { scale: 14 symbol { name: "tourism-s" - priority: 16855 + priority: 16841 min_distance: 12 } caption { @@ -62086,7 +62766,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { @@ -62094,7 +62774,7 @@ cont { symbol { name: "tourism-m" apply_for_type: 1 - priority: 16855 + priority: 16841 min_distance: 36 } caption { @@ -62103,14 +62783,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16855 + priority: 16841 min_distance: 36 } caption { @@ -62119,14 +62799,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 17 symbol { name: "tourism-l" - priority: 16855 + priority: 16841 min_distance: 24 } caption { @@ -62135,14 +62815,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 18 symbol { name: "tourism-l" - priority: 16855 + priority: 16841 min_distance: 24 } caption { @@ -62151,14 +62831,14 @@ cont { color: 4473924 offset_y: 12 } - priority: 15855 + priority: 15841 } } element { scale: 19 symbol { name: "tourism-l" - priority: 16855 + priority: 16841 min_distance: 24 } caption { @@ -62167,7 +62847,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15855 + priority: 15841 } } } @@ -62177,7 +62857,7 @@ cont { scale: 15 symbol { name: "campsite-m" - priority: 16567 + priority: 16623 min_distance: 12 } caption { @@ -62186,14 +62866,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 16 symbol { name: "campsite-m" - priority: 16567 + priority: 16623 min_distance: 12 } caption { @@ -62202,14 +62882,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 17 symbol { name: "campsite-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -62217,14 +62897,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 18 symbol { name: "campsite-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -62232,14 +62912,14 @@ cont { color: 4473924 offset_y: 12 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "campsite-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -62247,7 +62927,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15567 + priority: 15623 } } } @@ -62257,7 +62937,7 @@ cont { scale: 16 symbol { name: "caravan_site-m" - priority: 16540 + priority: 16594 min_distance: 30 } caption { @@ -62266,14 +62946,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "caravan_site-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -62282,14 +62962,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "caravan_site-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -62297,14 +62977,14 @@ cont { color: 4473924 offset_y: 12 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "caravan_site-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -62312,41 +62992,17 @@ cont { color: 4473924 offset_y: 12 } - priority: 15540 + priority: 15594 } } } cont { name: "tourism-chalet" - element { - scale: 14 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15684 - } - } - element { - scale: 15 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15684 - } - } element { scale: 16 symbol { name: "alpine_hut-m" - priority: 16684 + priority: 16752 min_distance: 24 } caption { @@ -62356,14 +63012,14 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15684 + priority: 15752 } } element { scale: 17 symbol { name: "alpine_hut-l" - priority: 16684 + priority: 16752 min_distance: 16 } caption { @@ -62373,14 +63029,14 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15684 + priority: 15752 } } element { scale: 18 symbol { name: "alpine_hut-l" - priority: 16684 + priority: 16752 } caption { primary { @@ -62389,14 +63045,14 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15684 + priority: 15752 } } element { scale: 19 symbol { name: "alpine_hut-l" - priority: 16684 + priority: 16752 } caption { primary { @@ -62405,7 +63061,7 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15684 + priority: 15752 } } } @@ -62416,7 +63072,7 @@ cont { symbol { name: "gallery-m" apply_for_type: 1 - priority: 16864 + priority: 16851 min_distance: 8 } caption { @@ -62425,14 +63081,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15864 + priority: 15851 } } element { scale: 16 symbol { name: "gallery-m" - priority: 16864 + priority: 16851 min_distance: 12 } caption { @@ -62441,14 +63097,14 @@ cont { color: 4473924 offset_y: 12 } - priority: 15864 + priority: 15851 } } element { scale: 17 symbol { name: "gallery-l" - priority: 16864 + priority: 16851 } caption { primary { @@ -62456,14 +63112,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15864 + priority: 15851 } } element { scale: 18 symbol { name: "gallery-l" - priority: 16864 + priority: 16851 } caption { primary { @@ -62471,14 +63127,14 @@ cont { color: 4473924 offset_y: 12 } - priority: 15864 + priority: 15851 } } element { scale: 19 symbol { name: "gallery-l" - priority: 16864 + priority: 16851 } caption { primary { @@ -62486,41 +63142,17 @@ cont { color: 4473924 offset_y: 12 } - priority: 15864 + priority: 15851 } } } cont { name: "tourism-guest_house" - element { - scale: 14 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15675 - } - } - element { - scale: 15 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15675 - } - } element { scale: 16 symbol { name: "motel-m" - priority: 16675 + priority: 16742 min_distance: 24 } caption { @@ -62530,14 +63162,14 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15675 + priority: 15742 } } element { scale: 17 symbol { name: "motel-l" - priority: 16675 + priority: 16742 min_distance: 16 } caption { @@ -62547,14 +63179,14 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15675 + priority: 15742 } } element { scale: 18 symbol { name: "motel-l" - priority: 16675 + priority: 16742 } caption { primary { @@ -62563,14 +63195,14 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15675 + priority: 15742 } } element { scale: 19 symbol { name: "motel-l" - priority: 16675 + priority: 16742 } caption { primary { @@ -62579,42 +63211,18 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15675 + priority: 15742 } } } cont { name: "tourism-hostel" - element { - scale: 14 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15666 - } - } - element { - scale: 15 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15666 - } - } element { scale: 16 symbol { name: "hotel-m" apply_for_type: 1 - priority: 16666 + priority: 16732 min_distance: 24 } caption { @@ -62624,7 +63232,7 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15666 + priority: 15732 } } element { @@ -62632,7 +63240,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16666 + priority: 16732 min_distance: 16 } caption { @@ -62642,7 +63250,7 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15666 + priority: 15732 } } element { @@ -62650,7 +63258,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16666 + priority: 16732 } caption { primary { @@ -62659,7 +63267,7 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15666 + priority: 15732 } } element { @@ -62667,7 +63275,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16666 + priority: 16732 } caption { primary { @@ -62676,42 +63284,18 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15666 + priority: 15732 } } } cont { name: "tourism-hotel" - element { - scale: 14 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15693 - } - } - element { - scale: 15 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15693 - } - } element { scale: 16 symbol { name: "hotel-m" apply_for_type: 1 - priority: 16693 + priority: 16762 min_distance: 24 } caption { @@ -62721,7 +63305,7 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15693 + priority: 15762 } } element { @@ -62729,7 +63313,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16693 + priority: 16762 min_distance: 16 } caption { @@ -62739,7 +63323,7 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15693 + priority: 15762 } } element { @@ -62747,7 +63331,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16693 + priority: 16762 } caption { primary { @@ -62756,7 +63340,7 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15693 + priority: 15762 } } element { @@ -62764,7 +63348,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16693 + priority: 16762 } caption { primary { @@ -62773,7 +63357,7 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15693 + priority: 15762 } } } @@ -62784,7 +63368,7 @@ cont { symbol { name: "information-m" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 10 } caption { @@ -62793,7 +63377,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -62801,7 +63385,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16531 + priority: 16584 } caption { primary { @@ -62809,7 +63393,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -62817,7 +63401,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -62825,7 +63409,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15540 + priority: 15594 } } element { @@ -62833,7 +63417,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -62841,7 +63425,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15540 + priority: 15594 } } } @@ -62852,7 +63436,7 @@ cont { symbol { name: "information-m" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 10 } caption { @@ -62861,7 +63445,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -62869,7 +63453,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16531 + priority: 16584 } caption { primary { @@ -62877,7 +63461,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -62885,7 +63469,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -62893,7 +63477,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15540 + priority: 15594 } } element { @@ -62901,7 +63485,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -62909,7 +63493,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15540 + priority: 15594 } } } @@ -62920,7 +63504,7 @@ cont { symbol { name: "information-m" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 10 } caption { @@ -62929,7 +63513,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -62937,7 +63521,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16531 + priority: 16584 } caption { primary { @@ -62945,7 +63529,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -62953,7 +63537,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -62961,7 +63545,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15540 + priority: 15594 } } element { @@ -62969,7 +63553,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -62977,7 +63561,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15540 + priority: 15594 } } } @@ -62988,7 +63572,7 @@ cont { symbol { name: "information-m" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 10 } caption { @@ -62997,7 +63581,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -63005,7 +63589,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16531 + priority: 16584 } caption { primary { @@ -63013,7 +63597,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -63021,7 +63605,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -63029,7 +63613,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15540 + priority: 15594 } } element { @@ -63037,7 +63621,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -63045,7 +63629,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15540 + priority: 15594 } } } @@ -63056,7 +63640,7 @@ cont { symbol { name: "information-m" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 10 } caption { @@ -63065,7 +63649,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -63073,7 +63657,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16531 + priority: 16584 } caption { primary { @@ -63081,7 +63665,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -63089,7 +63673,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -63097,7 +63681,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15540 + priority: 15594 } } element { @@ -63105,7 +63689,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -63113,41 +63697,17 @@ cont { color: 4473924 offset_y: 12 } - priority: 15540 + priority: 15594 } } } cont { name: "tourism-motel" - element { - scale: 14 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15666 - } - } - element { - scale: 15 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15666 - } - } element { scale: 16 symbol { name: "motel-m" - priority: 16666 + priority: 16732 min_distance: 24 } caption { @@ -63157,14 +63717,14 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15666 + priority: 15732 } } element { scale: 17 symbol { name: "motel-l" - priority: 16666 + priority: 16732 min_distance: 16 } caption { @@ -63174,14 +63734,14 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15666 + priority: 15732 } } element { scale: 18 symbol { name: "motel-l" - priority: 16666 + priority: 16732 } caption { primary { @@ -63190,14 +63750,14 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15666 + priority: 15732 } } element { scale: 19 symbol { name: "motel-l" - priority: 16666 + priority: 16732 } caption { primary { @@ -63206,7 +63766,7 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15666 + priority: 15732 } } } @@ -63216,7 +63776,7 @@ cont { scale: 13 symbol { name: "museum-s" - priority: 16873 + priority: 16861 min_distance: 16 } caption { @@ -63225,14 +63785,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15873 + priority: 15861 } } element { scale: 14 symbol { name: "museum-s" - priority: 16873 + priority: 16861 min_distance: 16 } caption { @@ -63241,14 +63801,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15873 + priority: 15861 } } element { scale: 15 symbol { name: "museum-m" - priority: 16873 + priority: 16861 min_distance: 24 } caption { @@ -63257,14 +63817,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15873 + priority: 15861 } } element { scale: 16 symbol { name: "museum-m" - priority: 16873 + priority: 16861 min_distance: 12 } caption { @@ -63273,14 +63833,14 @@ cont { color: 4473924 offset_y: 12 } - priority: 15873 + priority: 15861 } } element { scale: 17 symbol { name: "museum-l" - priority: 16873 + priority: 16861 } caption { primary { @@ -63288,14 +63848,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15873 + priority: 15861 } } element { scale: 18 symbol { name: "museum-l" - priority: 16873 + priority: 16861 } caption { primary { @@ -63303,14 +63863,14 @@ cont { color: 4473924 offset_y: 12 } - priority: 15873 + priority: 15861 } } element { scale: 19 symbol { name: "museum-l" - priority: 16873 + priority: 16861 } caption { primary { @@ -63318,7 +63878,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15873 + priority: 15861 } } } @@ -63328,7 +63888,7 @@ cont { scale: 16 symbol { name: "picnic-m" - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -63337,14 +63897,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 17 symbol { name: "picnic-l" - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -63353,14 +63913,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 18 symbol { name: "picnic-l" - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -63369,14 +63929,14 @@ cont { color: 4473924 offset_y: 12 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "picnic-l" - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -63385,41 +63945,17 @@ cont { color: 4473924 offset_y: 12 } - priority: 15567 + priority: 15623 } } } cont { name: "tourism-resort" - element { - scale: 14 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15684 - } - } - element { - scale: 15 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15684 - } - } element { scale: 16 symbol { name: "alpine_hut-m" - priority: 16684 + priority: 16752 min_distance: 24 } caption { @@ -63429,14 +63965,14 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15684 + priority: 15752 } } element { scale: 17 symbol { name: "alpine_hut-l" - priority: 16684 + priority: 16752 min_distance: 16 } caption { @@ -63446,14 +63982,14 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15684 + priority: 15752 } } element { scale: 18 symbol { name: "alpine_hut-l" - priority: 16684 + priority: 16752 } caption { primary { @@ -63462,14 +63998,14 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15684 + priority: 15752 } } element { scale: 19 symbol { name: "alpine_hut-l" - priority: 16684 + priority: 16752 } caption { primary { @@ -63478,7 +64014,7 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15684 + priority: 15752 } } } @@ -63489,7 +64025,7 @@ cont { symbol { name: "viewpoint-s" apply_for_type: 1 - priority: 16891 + priority: 16881 min_distance: 8 } caption { @@ -63498,7 +64034,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15891 + priority: 15881 } } element { @@ -63506,7 +64042,7 @@ cont { symbol { name: "viewpoint-m" apply_for_type: 1 - priority: 16891 + priority: 16881 min_distance: 8 } caption { @@ -63515,7 +64051,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15891 + priority: 15881 } } element { @@ -63523,7 +64059,7 @@ cont { symbol { name: "viewpoint-m" apply_for_type: 1 - priority: 16891 + priority: 16881 min_distance: 8 } caption { @@ -63532,7 +64068,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15891 + priority: 15881 } } element { @@ -63540,7 +64076,7 @@ cont { symbol { name: "viewpoint-l" apply_for_type: 1 - priority: 16891 + priority: 16881 } caption { primary { @@ -63548,7 +64084,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15891 + priority: 15881 } } element { @@ -63556,7 +64092,7 @@ cont { symbol { name: "viewpoint-l" apply_for_type: 1 - priority: 16891 + priority: 16881 } caption { primary { @@ -63564,7 +64100,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15891 + priority: 15881 } } element { @@ -63572,7 +64108,7 @@ cont { symbol { name: "viewpoint-l" apply_for_type: 1 - priority: 16891 + priority: 16881 } caption { primary { @@ -63580,7 +64116,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15891 + priority: 15881 } } } @@ -63590,7 +64126,7 @@ cont { scale: 13 symbol { name: "zoo-s" - priority: 16900 + priority: 16891 min_distance: 12 } caption { @@ -63599,14 +64135,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15900 + priority: 15891 } } element { scale: 14 symbol { name: "zoo-s" - priority: 16900 + priority: 16891 min_distance: 12 } caption { @@ -63615,14 +64151,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15900 + priority: 15891 } } element { scale: 15 symbol { name: "zoo-m" - priority: 16900 + priority: 16891 min_distance: 8 } caption { @@ -63631,14 +64167,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15900 + priority: 15891 } } element { scale: 16 symbol { name: "zoo-m" - priority: 16900 + priority: 16891 min_distance: 8 } caption { @@ -63647,14 +64183,14 @@ cont { color: 4473924 offset_y: 12 } - priority: 15900 + priority: 15891 } } element { scale: 17 symbol { name: "zoo-l" - priority: 16900 + priority: 16891 } caption { primary { @@ -63662,14 +64198,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15900 + priority: 15891 } } element { scale: 18 symbol { name: "zoo-l" - priority: 16900 + priority: 16891 } caption { primary { @@ -63677,14 +64213,14 @@ cont { color: 4473924 offset_y: 12 } - priority: 15900 + priority: 15891 } } element { scale: 19 symbol { name: "zoo-l" - priority: 16900 + priority: 16891 } caption { primary { @@ -63692,7 +64228,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15900 + priority: 15891 } } } @@ -63712,7 +64248,7 @@ cont { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -63729,7 +64265,7 @@ cont { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -63746,7 +64282,7 @@ cont { height: 11 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -63763,7 +64299,7 @@ cont { height: 11 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -63780,7 +64316,7 @@ cont { height: 11 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -63797,7 +64333,7 @@ cont { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -63814,7 +64350,7 @@ cont { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } } @@ -63888,7 +64424,7 @@ cont { lines { width: 1.0 color: 8421504 - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: BUTTCAP } @@ -63897,7 +64433,7 @@ cont { height: 10 color: 4473924 } - priority: 16972 + priority: 16970 } } element { @@ -63905,7 +64441,7 @@ cont { lines { width: 1.0 color: 8421504 - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -63914,7 +64450,7 @@ cont { height: 10 color: 4473924 } - priority: 16972 + priority: 16970 } } element { @@ -63922,7 +64458,7 @@ cont { lines { width: 1.0 color: 8421504 - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -63931,7 +64467,7 @@ cont { height: 10 color: 4473924 } - priority: 16972 + priority: 16970 } } element { @@ -63939,7 +64475,7 @@ cont { lines { width: 1.0 color: 8421504 - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -63948,7 +64484,7 @@ cont { height: 10 color: 4473924 } - priority: 16972 + priority: 16970 } } element { @@ -63956,7 +64492,7 @@ cont { lines { width: 1.0 color: 8421504 - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -63965,7 +64501,7 @@ cont { height: 10 color: 4473924 } - priority: 16972 + priority: 16970 } } } @@ -63980,7 +64516,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -63994,7 +64530,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -64008,7 +64544,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -64051,140 +64587,140 @@ cont { scale: 0 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 1 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 2 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 3 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 4 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 5 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 6 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 7 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 8 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 9 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 10 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 11 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 12 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 13 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 14 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 15 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 16 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 17 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 18 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 19 area { color: 9163744 - priority: -15028 + priority: -15030 } } } @@ -64199,7 +64735,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -64213,7 +64749,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -64227,7 +64763,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -64314,7 +64850,7 @@ cont { symbol { name: "dot-m" apply_for_type: 1 - priority: 16153 + priority: 16168 } } element { @@ -64322,7 +64858,7 @@ cont { symbol { name: "dot-m" apply_for_type: 1 - priority: 16153 + priority: 16168 } } element { @@ -64330,7 +64866,7 @@ cont { symbol { name: "dot-m" apply_for_type: 1 - priority: 16153 + priority: 16168 } } element { @@ -64338,7 +64874,7 @@ cont { symbol { name: "dot-m" apply_for_type: 1 - priority: 16153 + priority: 16168 } } } @@ -64368,7 +64904,7 @@ cont { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64385,7 +64921,7 @@ cont { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64402,7 +64938,7 @@ cont { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64419,7 +64955,7 @@ cont { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64436,7 +64972,7 @@ cont { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64453,7 +64989,7 @@ cont { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64470,7 +65006,7 @@ cont { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64487,7 +65023,7 @@ cont { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64504,7 +65040,7 @@ cont { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } } @@ -64607,70 +65143,70 @@ cont { scale: 0 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 1 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 2 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 3 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 4 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 5 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 6 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 7 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 8 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 9 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { @@ -64684,7 +65220,7 @@ cont { } area { color: 9163744 - priority: -15028 + priority: -15030 } } element { @@ -64698,14 +65234,14 @@ cont { } area { color: 9163744 - priority: -15028 + priority: -15030 } path_text { primary { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64719,14 +65255,14 @@ cont { } area { color: 9163744 - priority: -15028 + priority: -15030 } path_text { primary { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64740,14 +65276,14 @@ cont { } area { color: 9163744 - priority: -15028 + priority: -15030 } path_text { primary { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64761,14 +65297,14 @@ cont { } area { color: 9163744 - priority: -15028 + priority: -15030 } path_text { primary { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64782,14 +65318,14 @@ cont { } area { color: 9163744 - priority: -15028 + priority: -15030 } path_text { primary { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64803,14 +65339,14 @@ cont { } area { color: 9163744 - priority: -15028 + priority: -15030 } path_text { primary { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64824,14 +65360,14 @@ cont { } area { color: 9163744 - priority: -15028 + priority: -15030 } path_text { primary { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64845,14 +65381,14 @@ cont { } area { color: 9163744 - priority: -15028 + priority: -15030 } path_text { primary { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64866,14 +65402,14 @@ cont { } area { color: 9163744 - priority: -15028 + priority: -15030 } path_text { primary { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } } @@ -64893,7 +65429,7 @@ cont { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64910,7 +65446,7 @@ cont { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64927,7 +65463,7 @@ cont { height: 11 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64944,7 +65480,7 @@ cont { height: 11 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64961,7 +65497,7 @@ cont { height: 11 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64978,7 +65514,7 @@ cont { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64995,7 +65531,7 @@ cont { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } } @@ -65015,7 +65551,7 @@ cont { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -65032,7 +65568,7 @@ cont { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -65049,7 +65585,7 @@ cont { height: 11 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -65066,7 +65602,7 @@ cont { height: 11 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -65083,7 +65619,7 @@ cont { height: 11 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -65100,7 +65636,7 @@ cont { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -65117,7 +65653,7 @@ cont { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } } @@ -65141,7 +65677,7 @@ cont { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -65162,7 +65698,7 @@ cont { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -65183,7 +65719,7 @@ cont { height: 11 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -65204,7 +65740,7 @@ cont { height: 11 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -65225,7 +65761,7 @@ cont { height: 11 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -65246,7 +65782,7 @@ cont { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -65267,7 +65803,7 @@ cont { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } } @@ -65277,7 +65813,7 @@ cont { scale: 11 symbol { name: "waterfall-s" - priority: 16531 + priority: 16584 min_distance: 15 } caption { @@ -65286,14 +65822,14 @@ cont { color: 4473924 offset_y: 5 } - priority: 15531 + priority: 15584 } } element { scale: 12 symbol { name: "waterfall-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -65301,14 +65837,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 13 symbol { name: "waterfall-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -65316,14 +65852,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 14 symbol { name: "waterfall-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -65331,14 +65867,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 15 symbol { name: "waterfall-m" - priority: 16531 + priority: 16584 } caption { primary { @@ -65346,14 +65882,14 @@ cont { color: 4473924 offset_y: 8 } - priority: 15531 + priority: 15584 } } element { scale: 16 symbol { name: "waterfall-m" - priority: 16531 + priority: 16584 } caption { primary { @@ -65361,14 +65897,14 @@ cont { color: 4473924 offset_y: 8 } - priority: 15531 + priority: 15584 } } element { scale: 17 symbol { name: "waterfall-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -65376,14 +65912,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "waterfall-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -65391,14 +65927,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "waterfall-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -65406,7 +65942,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -65417,7 +65953,7 @@ cont { lines { width: 1.0 color: 8421504 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -65426,7 +65962,7 @@ cont { height: 10 color: 4473924 } - priority: 16423 + priority: 16465 } } element { @@ -65434,7 +65970,7 @@ cont { lines { width: 1.0 color: 8421504 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -65443,7 +65979,7 @@ cont { height: 10 color: 4473924 } - priority: 16423 + priority: 16465 } } element { @@ -65451,7 +65987,7 @@ cont { lines { width: 1.0 color: 8421504 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -65460,7 +65996,7 @@ cont { height: 10 color: 4473924 } - priority: 16423 + priority: 16465 } } element { @@ -65468,7 +66004,7 @@ cont { lines { width: 1.0 color: 8421504 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -65477,7 +66013,7 @@ cont { height: 10 color: 4473924 } - priority: 16423 + priority: 16465 } } element { @@ -65485,7 +66021,7 @@ cont { lines { width: 1.0 color: 8421504 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -65494,7 +66030,7 @@ cont { height: 10 color: 4473924 } - priority: 16423 + priority: 16465 } } } diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 8fdb969390..3aae62303c 100644 Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index d31d849efe..0fa518ecf2 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -5,7 +5,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: BEVELJOIN cap: BUTTCAP } @@ -16,14 +16,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: BEVELJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -32,7 +32,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -43,14 +43,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -59,7 +59,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -70,14 +70,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 } } element { @@ -85,7 +85,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -96,14 +96,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -112,7 +112,7 @@ cont { stroke_color: 1308622847 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -120,7 +120,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -131,14 +131,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -147,7 +147,7 @@ cont { stroke_color: 1308622847 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -155,7 +155,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -166,14 +166,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -182,7 +182,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -190,7 +190,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -201,14 +201,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -217,7 +217,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -225,7 +225,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -236,14 +236,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -252,7 +252,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } } @@ -263,7 +263,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: BEVELJOIN cap: BUTTCAP } @@ -274,14 +274,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: BEVELJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -290,7 +290,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -301,14 +301,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -317,7 +317,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -328,14 +328,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 } } element { @@ -343,7 +343,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -354,14 +354,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -370,7 +370,7 @@ cont { stroke_color: 1308622847 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -378,7 +378,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -389,14 +389,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -405,7 +405,7 @@ cont { stroke_color: 1308622847 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -413,7 +413,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -424,14 +424,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -440,7 +440,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -448,7 +448,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -459,14 +459,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -475,7 +475,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -483,7 +483,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -494,14 +494,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -510,7 +510,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } } @@ -521,7 +521,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1459 + priority: 1504 join: BEVELJOIN cap: BUTTCAP } @@ -532,7 +532,7 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: BEVELJOIN cap: BUTTCAP } @@ -542,7 +542,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1459 + priority: 1504 join: ROUNDJOIN cap: BUTTCAP } @@ -553,7 +553,7 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } @@ -563,7 +563,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1459 + priority: 1504 join: ROUNDJOIN cap: BUTTCAP } @@ -574,7 +574,7 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } @@ -584,7 +584,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -595,14 +595,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -611,7 +611,7 @@ cont { stroke_color: 1308622847 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -619,7 +619,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -630,14 +630,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -646,7 +646,7 @@ cont { stroke_color: 1308622847 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -654,7 +654,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -665,14 +665,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -681,7 +681,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -689,7 +689,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -700,14 +700,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -716,7 +716,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -724,7 +724,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -735,14 +735,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -751,7 +751,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } } @@ -762,7 +762,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: BEVELJOIN cap: BUTTCAP } @@ -773,14 +773,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: BEVELJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -789,7 +789,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -800,14 +800,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -816,7 +816,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -827,14 +827,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 } } element { @@ -842,7 +842,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -853,14 +853,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -869,7 +869,7 @@ cont { stroke_color: 1308622847 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -877,7 +877,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -888,14 +888,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -904,7 +904,7 @@ cont { stroke_color: 1308622847 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -912,7 +912,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -923,14 +923,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -939,7 +939,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -947,7 +947,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -958,14 +958,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -974,7 +974,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -982,7 +982,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -993,14 +993,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1009,7 +1009,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } } @@ -1020,7 +1020,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: BEVELJOIN cap: BUTTCAP } @@ -1031,14 +1031,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: BEVELJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -1047,7 +1047,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -1058,14 +1058,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -1074,7 +1074,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -1085,14 +1085,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 } } element { @@ -1100,7 +1100,7 @@ cont { lines { width: 0.5 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -1111,14 +1111,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1127,7 +1127,7 @@ cont { stroke_color: 1308622847 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -1135,7 +1135,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -1146,14 +1146,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1162,7 +1162,7 @@ cont { stroke_color: 1308622847 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -1170,7 +1170,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -1181,14 +1181,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1197,7 +1197,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -1205,7 +1205,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -1216,14 +1216,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1232,7 +1232,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -1240,7 +1240,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -1251,14 +1251,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1267,7 +1267,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } } @@ -1278,7 +1278,7 @@ cont { symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -1287,7 +1287,7 @@ cont { symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -1296,7 +1296,7 @@ cont { symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 } } element { @@ -1304,7 +1304,7 @@ cont { symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1313,7 +1313,7 @@ cont { stroke_color: 1308622847 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -1321,7 +1321,7 @@ cont { symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1330,7 +1330,7 @@ cont { stroke_color: 1308622847 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -1338,7 +1338,7 @@ cont { symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1347,7 +1347,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -1355,7 +1355,7 @@ cont { symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1364,7 +1364,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -1372,7 +1372,7 @@ cont { symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1381,7 +1381,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15594 + priority: 15653 } } } @@ -1391,7 +1391,7 @@ cont { scale: 10 area { color: 13942770 - priority: -15046 + priority: -15050 } caption { primary { @@ -1399,14 +1399,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 15954 + priority: 15950 } } element { scale: 11 area { color: 13942770 - priority: -15046 + priority: -15050 } caption { primary { @@ -1414,14 +1414,14 @@ cont { color: 2236962 stroke_color: 1308622847 } - priority: 15954 + priority: 15950 } } element { scale: 12 area { color: 13746411 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" @@ -1441,14 +1441,14 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 13 area { color: 13615592 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" @@ -1468,14 +1468,14 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 14 area { color: 13484259 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" @@ -1495,18 +1495,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 15 area { color: 13155550 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" - priority: 16954 + priority: 16950 } caption { primary { @@ -1522,18 +1522,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 16 area { color: 13155550 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" - priority: 16954 + priority: 16950 } caption { primary { @@ -1549,18 +1549,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 17 area { color: 13155550 - priority: -15046 + priority: -15050 } symbol { name: "airport-l" - priority: 16954 + priority: 16950 } caption { primary { @@ -1576,18 +1576,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 18 area { color: 13155550 - priority: -15046 + priority: -15050 } symbol { name: "airport-l" - priority: 16954 + priority: 16950 } caption { primary { @@ -1603,18 +1603,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 19 area { color: 13155550 - priority: -15046 + priority: -15050 } symbol { name: "airport-l" - priority: 16954 + priority: 16950 } caption { primary { @@ -1630,7 +1630,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } } @@ -1640,11 +1640,11 @@ cont { scale: 10 area { color: 13942770 - priority: -15046 + priority: -15050 } symbol { name: "airport-s" - priority: 16954 + priority: 16950 } caption { primary { @@ -1653,14 +1653,14 @@ cont { stroke_color: 1308622847 offset_y: 7 } - priority: 15954 + priority: 15950 } } element { scale: 11 area { color: 13942770 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" @@ -1673,14 +1673,14 @@ cont { stroke_color: 1308622847 offset_y: 7 } - priority: 15954 + priority: 15950 } } element { scale: 12 area { color: 13746411 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" @@ -1700,14 +1700,14 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 13 area { color: 13615592 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" @@ -1727,14 +1727,14 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 14 area { color: 13484259 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" @@ -1754,18 +1754,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 15 area { color: 13155550 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" - priority: 16954 + priority: 16950 } caption { primary { @@ -1781,18 +1781,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 16 area { color: 13155550 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" - priority: 16954 + priority: 16950 } caption { primary { @@ -1808,18 +1808,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 17 area { color: 13155550 - priority: -15046 + priority: -15050 } symbol { name: "airport-l" - priority: 16954 + priority: 16950 } caption { primary { @@ -1835,18 +1835,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 18 area { color: 13155550 - priority: -15046 + priority: -15050 } symbol { name: "airport-l" - priority: 16954 + priority: 16950 } caption { primary { @@ -1862,18 +1862,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 19 area { color: 13155550 - priority: -15046 + priority: -15050 } symbol { name: "airport-l" - priority: 16954 + priority: 16950 } caption { primary { @@ -1889,7 +1889,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } } @@ -1899,7 +1899,7 @@ cont { scale: 17 symbol { name: "gate-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -1907,14 +1907,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "gate-l" - priority: 16981 + priority: 16980 } caption { primary { @@ -1922,14 +1922,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15981 + priority: 15980 } } element { scale: 19 symbol { name: "gate-l" - priority: 16981 + priority: 16980 } caption { primary { @@ -1937,7 +1937,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15981 + priority: 15980 } } } @@ -1947,7 +1947,7 @@ cont { scale: 17 symbol { name: "helipad-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -1955,14 +1955,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "helipad-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -1970,14 +1970,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "helipad-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -1985,7 +1985,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -1996,7 +1996,7 @@ cont { lines { width: 1.0 color: 2163800312 - priority: 1135 + priority: 1148 join: BEVELJOIN cap: BUTTCAP } @@ -2006,7 +2006,7 @@ cont { lines { width: 1.5 color: 871954680 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: BUTTCAP } @@ -2016,7 +2016,7 @@ cont { lines { width: 2.4 color: 16316664 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: BUTTCAP } @@ -2026,7 +2026,7 @@ cont { lines { width: 2.4 color: 16316664 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: BUTTCAP } @@ -2036,7 +2036,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: ROUNDCAP } @@ -2046,7 +2046,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: ROUNDCAP } @@ -2056,7 +2056,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: ROUNDCAP } @@ -2066,7 +2066,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: ROUNDCAP } @@ -2079,7 +2079,7 @@ cont { lines { width: 0.6 color: 1727592696 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: BUTTCAP } @@ -2089,7 +2089,7 @@ cont { lines { width: 1.2 color: 1727592696 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: BUTTCAP } @@ -2099,7 +2099,7 @@ cont { lines { width: 1.2 color: 1727592696 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: ROUNDCAP } @@ -2109,7 +2109,7 @@ cont { lines { width: 1.2 color: 1727592696 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: ROUNDCAP } @@ -2119,7 +2119,7 @@ cont { lines { width: 1.2 color: 1727592696 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: ROUNDCAP } @@ -2129,7 +2129,7 @@ cont { lines { width: 1.2 color: 1727592696 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: ROUNDCAP } @@ -2145,7 +2145,7 @@ cont { width: 1.0 color: 10592406 } - priority: -15793 + priority: -15773 } } element { @@ -2156,14 +2156,14 @@ cont { width: 1.0 color: 10592406 } - priority: -15793 + priority: -15773 } caption { primary { height: 9 color: 6381914 } - priority: 15207 + priority: 15227 } } element { @@ -2174,14 +2174,14 @@ cont { width: 1.0 color: 10197647 } - priority: -15793 + priority: -15773 } caption { primary { height: 9 color: 6381914 } - priority: 15207 + priority: 15227 } } element { @@ -2192,14 +2192,14 @@ cont { width: 1.0 color: 10197647 } - priority: -15793 + priority: -15773 } caption { primary { height: 9 color: 6381914 } - priority: 15207 + priority: 15227 } } element { @@ -2210,14 +2210,14 @@ cont { width: 1.0 color: 10197647 } - priority: -15793 + priority: -15773 } caption { primary { height: 9 color: 6381914 } - priority: 15207 + priority: 15227 } } element { @@ -2228,14 +2228,14 @@ cont { width: 1.0 color: 10197647 } - priority: -15793 + priority: -15773 } caption { primary { height: 9 color: 6381914 } - priority: 15207 + priority: 15227 } } } @@ -2259,7 +2259,7 @@ cont { scale: 18 symbol { name: "atm-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -2267,14 +2267,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "atm-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -2282,7 +2282,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -2292,7 +2292,7 @@ cont { scale: 16 symbol { name: "bank-m" - priority: 16594 + priority: 16653 } caption { primary { @@ -2300,14 +2300,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { scale: 17 symbol { name: "bank-m" - priority: 16594 + priority: 16653 } caption { primary { @@ -2315,14 +2315,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "bank-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -2330,14 +2330,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "bank-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -2345,7 +2345,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -2355,7 +2355,7 @@ cont { scale: 15 symbol { name: "beer-m" - priority: 16621 + priority: 16683 min_distance: 28 } caption { @@ -2364,14 +2364,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15621 + priority: 15683 } } element { scale: 16 symbol { name: "beer-m" - priority: 16621 + priority: 16683 min_distance: 12 } caption { @@ -2380,14 +2380,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15621 + priority: 15683 } } element { scale: 17 symbol { name: "beer-l" - priority: 16621 + priority: 16683 min_distance: 12 } caption { @@ -2396,14 +2396,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15621 + priority: 15683 } } element { scale: 18 symbol { name: "beer-l" - priority: 16621 + priority: 16683 } caption { primary { @@ -2411,14 +2411,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15621 + priority: 15683 } } element { scale: 19 symbol { name: "beer-l" - priority: 16621 + priority: 16683 } caption { primary { @@ -2426,7 +2426,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15621 + priority: 15683 } } } @@ -2436,7 +2436,7 @@ cont { scale: 18 symbol { name: "bbq-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -2451,7 +2451,7 @@ cont { scale: 19 symbol { name: "bbq-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -2470,7 +2470,7 @@ cont { symbol { name: "bench" apply_for_type: 1 - priority: 16522 + priority: 16574 } } element { @@ -2478,7 +2478,7 @@ cont { symbol { name: "bench" apply_for_type: 1 - priority: 16522 + priority: 16574 } caption { primary { @@ -2486,7 +2486,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15522 + priority: 15574 } } } @@ -2496,7 +2496,7 @@ cont { scale: 17 symbol { name: "bike-parking-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -2505,14 +2505,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "bike-parking-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -2521,14 +2521,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "bike-parking-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -2537,7 +2537,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -2547,7 +2547,7 @@ cont { scale: 17 symbol { name: "bicycle-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -2555,14 +2555,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 18 symbol { name: "bicycle-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -2570,14 +2570,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "bicycle-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -2585,7 +2585,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -2610,7 +2610,7 @@ cont { symbol { name: "banknote-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } } element { @@ -2618,7 +2618,7 @@ cont { symbol { name: "banknote-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } caption { primary { @@ -2626,7 +2626,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { @@ -2634,7 +2634,7 @@ cont { symbol { name: "banknote-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } caption { primary { @@ -2642,7 +2642,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -2652,7 +2652,7 @@ cont { scale: 12 symbol { name: "bus-s" - priority: 16603 + priority: 16663 min_distance: 1 } } @@ -2660,7 +2660,7 @@ cont { scale: 13 symbol { name: "bus-s" - priority: 16603 + priority: 16663 min_distance: 1 } } @@ -2668,7 +2668,7 @@ cont { scale: 14 symbol { name: "bus-s" - priority: 16603 + priority: 16663 } caption { primary { @@ -2684,14 +2684,14 @@ cont { offset_y: 20 text: "int_name" } - priority: 15603 + priority: 15663 } } element { scale: 15 symbol { name: "bus-m" - priority: 16603 + priority: 16663 } caption { primary { @@ -2707,14 +2707,14 @@ cont { offset_y: 8 text: "int_name" } - priority: 15603 + priority: 15663 } } element { scale: 16 symbol { name: "bus-m" - priority: 16603 + priority: 16663 } caption { primary { @@ -2730,14 +2730,14 @@ cont { offset_y: 8 text: "int_name" } - priority: 15603 + priority: 15663 } } element { scale: 17 symbol { name: "bus-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -2753,14 +2753,14 @@ cont { offset_y: 8 text: "int_name" } - priority: 15603 + priority: 15663 } } element { scale: 18 symbol { name: "bus-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -2776,14 +2776,14 @@ cont { offset_y: 8 text: "int_name" } - priority: 15603 + priority: 15663 } } element { scale: 19 symbol { name: "bus-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -2799,7 +2799,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15603 + priority: 15663 } } } @@ -2809,7 +2809,7 @@ cont { scale: 15 symbol { name: "cafe-m" - priority: 16648 + priority: 16712 min_distance: 12 } caption { @@ -2818,14 +2818,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15648 + priority: 15712 } } element { scale: 16 symbol { name: "cafe-m" - priority: 16648 + priority: 16712 min_distance: 12 } caption { @@ -2834,14 +2834,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15648 + priority: 15712 } } element { scale: 17 symbol { name: "cafe-l" - priority: 16648 + priority: 16712 min_distance: 12 } caption { @@ -2850,14 +2850,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15648 + priority: 15712 } } element { scale: 18 symbol { name: "cafe-l" - priority: 16648 + priority: 16712 } caption { primary { @@ -2865,14 +2865,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15648 + priority: 15712 } } element { scale: 19 symbol { name: "cafe-l" - priority: 16648 + priority: 16712 } caption { primary { @@ -2880,7 +2880,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15648 + priority: 15712 } } } @@ -2890,7 +2890,7 @@ cont { scale: 18 symbol { name: "car_sharing-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -2898,14 +2898,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "car_sharing-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -2913,7 +2913,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -2923,7 +2923,7 @@ cont { scale: 18 symbol { name: "car_sharing-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -2931,14 +2931,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "car_sharing-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -2946,7 +2946,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -2956,7 +2956,7 @@ cont { scale: 17 symbol { name: "car-wash-l" - priority: 16567 + priority: 16623 min_distance: 24 } caption { @@ -2965,7 +2965,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { @@ -2973,7 +2973,7 @@ cont { symbol { name: "car-wash-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } caption { primary { @@ -2981,7 +2981,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { @@ -2989,7 +2989,7 @@ cont { symbol { name: "car-wash-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } caption { primary { @@ -2997,7 +2997,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -3007,7 +3007,7 @@ cont { scale: 17 symbol { name: "casino-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -3016,14 +3016,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "casino-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -3032,14 +3032,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "casino-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -3048,7 +3048,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -3058,7 +3058,7 @@ cont { scale: 14 symbol { name: "charging-station-s" - priority: 16585 + priority: 16643 min_distance: 20 } caption { @@ -3074,7 +3074,7 @@ cont { scale: 15 symbol { name: "charging-station-m" - priority: 16585 + priority: 16643 min_distance: 20 } caption { @@ -3090,7 +3090,7 @@ cont { scale: 16 symbol { name: "charging-station-m" - priority: 16585 + priority: 16643 min_distance: 10 } caption { @@ -3106,7 +3106,7 @@ cont { scale: 17 symbol { name: "charging-station-l" - priority: 16585 + priority: 16643 } caption { primary { @@ -3114,14 +3114,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15585 + priority: 15643 } } element { scale: 18 symbol { name: "charging-station-l" - priority: 16585 + priority: 16643 } caption { primary { @@ -3129,14 +3129,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15585 + priority: 15643 } } element { scale: 19 symbol { name: "charging-station-l" - priority: 16585 + priority: 16643 } caption { primary { @@ -3144,7 +3144,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15585 + priority: 15643 } } } @@ -3154,7 +3154,7 @@ cont { scale: 17 symbol { name: "kindergarten-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -3162,14 +3162,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "kindergarten-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -3177,14 +3177,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "kindergarten-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -3192,7 +3192,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -3202,7 +3202,7 @@ cont { scale: 17 symbol { name: "cinema-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3210,14 +3210,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "cinema-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3225,14 +3225,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "cinema-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3240,7 +3240,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -3250,7 +3250,7 @@ cont { scale: 17 symbol { name: "hospital-l" - priority: 16594 + priority: 16653 min_distance: 4 } caption { @@ -3259,14 +3259,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "hospital-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3274,14 +3274,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "hospital-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3289,7 +3289,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -3299,7 +3299,7 @@ cont { scale: 17 symbol { name: "college-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3307,14 +3307,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "college-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3322,14 +3322,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "college-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3337,7 +3337,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -3347,7 +3347,7 @@ cont { scale: 14 symbol { name: "tourism-s" - priority: 16846 + priority: 16831 min_distance: 8 } caption { @@ -3356,14 +3356,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15846 + priority: 15831 } } element { scale: 15 symbol { name: "tourism-m" - priority: 16846 + priority: 16831 min_distance: 24 } caption { @@ -3372,14 +3372,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15846 + priority: 15831 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16846 + priority: 16831 min_distance: 16 } caption { @@ -3388,7 +3388,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15846 + priority: 15831 } } element { @@ -3399,7 +3399,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15846 + priority: 15831 } } element { @@ -3410,7 +3410,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15846 + priority: 15831 } } element { @@ -3421,7 +3421,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15846 + priority: 15831 } } } @@ -3431,7 +3431,7 @@ cont { scale: 17 symbol { name: "public-building-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3439,14 +3439,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "public-building-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3454,14 +3454,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "public-building-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3469,7 +3469,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -3479,7 +3479,7 @@ cont { scale: 17 symbol { name: "dentist-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -3487,14 +3487,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "dentist-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -3502,14 +3502,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "dentist-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -3517,7 +3517,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -3527,32 +3527,32 @@ cont { scale: 14 area { color: 16308697 - priority: -15406 + priority: -15347 } } element { scale: 15 area { color: 16308697 - priority: -15406 + priority: -15347 } } element { scale: 16 area { color: 16308697 - priority: -15406 + priority: -15347 } } element { scale: 17 area { color: 16308697 - priority: -15406 + priority: -15347 } symbol { name: "hospital-l" - priority: 16594 + priority: 16653 min_distance: 4 } caption { @@ -3561,18 +3561,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 area { color: 16308697 - priority: -15406 + priority: -15347 } symbol { name: "hospital-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3580,18 +3580,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 area { color: 16308697 - priority: -15406 + priority: -15347 } symbol { name: "hospital-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3599,7 +3599,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -3609,7 +3609,7 @@ cont { scale: 15 symbol { name: "drinking-water-m" - priority: 16522 + priority: 16574 min_distance: 36 } } @@ -3617,7 +3617,7 @@ cont { scale: 16 symbol { name: "drinking-water-m" - priority: 16522 + priority: 16574 min_distance: 36 } } @@ -3625,21 +3625,21 @@ cont { scale: 17 symbol { name: "drinking-water-l" - priority: 16522 + priority: 16574 } } element { scale: 18 symbol { name: "drinking-water-l" - priority: 16522 + priority: 16574 } } element { scale: 19 symbol { name: "drinking-water-l" - priority: 16522 + priority: 16574 } caption { primary { @@ -3647,7 +3647,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15522 + priority: 15574 } } } @@ -3657,7 +3657,7 @@ cont { scale: 17 symbol { name: "embassy-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3665,14 +3665,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "embassy-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3680,14 +3680,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "embassy-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3695,7 +3695,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -3705,7 +3705,7 @@ cont { scale: 15 symbol { name: "fastfood-m" - priority: 16630 + priority: 16693 min_distance: 28 } caption { @@ -3714,14 +3714,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15630 + priority: 15693 } } element { scale: 16 symbol { name: "fastfood-m" - priority: 16630 + priority: 16693 min_distance: 12 } caption { @@ -3730,14 +3730,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15630 + priority: 15693 } } element { scale: 17 symbol { name: "fastfood-l" - priority: 16630 + priority: 16693 min_distance: 12 } caption { @@ -3746,14 +3746,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15630 + priority: 15693 } } element { scale: 18 symbol { name: "fastfood-l" - priority: 16630 + priority: 16693 } caption { primary { @@ -3761,14 +3761,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15630 + priority: 15693 } } element { scale: 19 symbol { name: "fastfood-l" - priority: 16630 + priority: 16693 } caption { primary { @@ -3776,7 +3776,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15630 + priority: 15693 } } } @@ -3787,7 +3787,7 @@ cont { symbol { name: "ship-s" apply_for_type: 1 - priority: 16603 + priority: 16663 min_distance: 12 } } @@ -3796,7 +3796,7 @@ cont { symbol { name: "ship-s" apply_for_type: 1 - priority: 16603 + priority: 16663 min_distance: 12 } } @@ -3805,7 +3805,7 @@ cont { symbol { name: "ship-s" apply_for_type: 1 - priority: 16603 + priority: 16663 } } element { @@ -3813,7 +3813,7 @@ cont { symbol { name: "ship-s" apply_for_type: 1 - priority: 16603 + priority: 16663 } } element { @@ -3821,7 +3821,7 @@ cont { symbol { name: "ship-m" apply_for_type: 1 - priority: 16603 + priority: 16663 } } element { @@ -3829,7 +3829,7 @@ cont { symbol { name: "ship-m" apply_for_type: 1 - priority: 16603 + priority: 16663 } caption { primary { @@ -3838,7 +3838,7 @@ cont { stroke_color: 872415231 offset_y: 8 } - priority: 15603 + priority: 15663 } } element { @@ -3846,7 +3846,7 @@ cont { symbol { name: "ship-l" apply_for_type: 1 - priority: 16603 + priority: 16663 } caption { primary { @@ -3855,7 +3855,7 @@ cont { stroke_color: 1308622847 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { @@ -3863,7 +3863,7 @@ cont { symbol { name: "ship-l" apply_for_type: 1 - priority: 16603 + priority: 16663 } caption { primary { @@ -3872,7 +3872,7 @@ cont { stroke_color: 1308622847 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { @@ -3880,7 +3880,7 @@ cont { symbol { name: "ship-l" apply_for_type: 1 - priority: 16603 + priority: 16663 } caption { primary { @@ -3889,7 +3889,7 @@ cont { stroke_color: 1308622847 offset_y: 10 } - priority: 15603 + priority: 15663 } } } @@ -3899,7 +3899,7 @@ cont { scale: 18 symbol { name: "fire_station-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -3907,14 +3907,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "fire_station-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -3922,7 +3922,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -3932,11 +3932,11 @@ cont { scale: 16 area { color: 9163744 - priority: -15487 + priority: -15436 } symbol { name: "fountain-m" - priority: 16513 + priority: 16564 min_distance: 20 } caption { @@ -3945,18 +3945,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15513 + priority: 15564 } } element { scale: 17 area { color: 9163744 - priority: -15487 + priority: -15436 } symbol { name: "fountain-l" - priority: 16513 + priority: 16564 min_distance: 24 } caption { @@ -3965,18 +3965,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15513 + priority: 15564 } } element { scale: 18 area { color: 9163744 - priority: -15487 + priority: -15436 } symbol { name: "fountain-l" - priority: 16513 + priority: 16564 min_distance: 24 } caption { @@ -3985,18 +3985,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15513 + priority: 15564 } } element { scale: 19 area { color: 9163744 - priority: -15487 + priority: -15436 } symbol { name: "fountain-l" - priority: 16513 + priority: 16564 min_distance: 24 } caption { @@ -4005,7 +4005,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15513 + priority: 15564 } } } @@ -4015,7 +4015,7 @@ cont { scale: 14 symbol { name: "fuel-s" - priority: 16585 + priority: 16643 min_distance: 20 } caption { @@ -4031,7 +4031,7 @@ cont { scale: 15 symbol { name: "fuel-m" - priority: 16585 + priority: 16643 min_distance: 20 } caption { @@ -4047,7 +4047,7 @@ cont { scale: 16 symbol { name: "fuel-m" - priority: 16585 + priority: 16643 min_distance: 10 } caption { @@ -4063,7 +4063,7 @@ cont { scale: 17 symbol { name: "fuel-l" - priority: 16585 + priority: 16643 } caption { primary { @@ -4071,14 +4071,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15585 + priority: 15643 } } element { scale: 18 symbol { name: "fuel-l" - priority: 16585 + priority: 16643 } caption { primary { @@ -4086,14 +4086,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15585 + priority: 15643 } } element { scale: 19 symbol { name: "fuel-l" - priority: 16585 + priority: 16643 } caption { primary { @@ -4101,7 +4101,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15585 + priority: 15643 } } } @@ -4111,32 +4111,32 @@ cont { scale: 14 area { color: 666683518 - priority: -15640 + priority: -15604 } } element { scale: 15 area { color: 12372094 - priority: -15640 + priority: -15604 } } element { scale: 16 area { color: 11781233 - priority: -15640 + priority: -15604 } } element { scale: 17 area { color: 11781233 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -4144,18 +4144,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 18 area { color: 11781233 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -4163,18 +4163,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 19 area { color: 11781233 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -4182,7 +4182,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } } @@ -4192,32 +4192,32 @@ cont { scale: 14 area { color: 666683518 - priority: -15640 + priority: -15604 } } element { scale: 15 area { color: 12372094 - priority: -15640 + priority: -15604 } } element { scale: 16 area { color: 11781233 - priority: -15640 + priority: -15604 } } element { scale: 17 area { color: 11781233 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -4225,18 +4225,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 18 area { color: 11781233 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -4244,18 +4244,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 19 area { color: 11781233 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -4263,7 +4263,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } } @@ -4273,11 +4273,11 @@ cont { scale: 14 area { color: 16308697 - priority: -15082 + priority: -15090 } symbol { name: "hospital-s" - priority: 16918 + priority: 16910 min_distance: 8 } } @@ -4285,12 +4285,12 @@ cont { scale: 15 area { color: 16308697 - priority: -15082 + priority: -15090 } symbol { name: "hospital-m" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 6 } caption { @@ -4299,19 +4299,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15918 + priority: 15910 } } element { scale: 16 area { color: 16308697 - priority: -15082 + priority: -15090 } symbol { name: "hospital-m" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 4 } caption { @@ -4320,19 +4320,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15918 + priority: 15910 } } element { scale: 17 area { color: 16308697 - priority: -15082 + priority: -15090 } symbol { name: "hospital-l" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 4 } caption { @@ -4341,19 +4341,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15918 + priority: 15910 } } element { scale: 18 area { color: 16308697 - priority: -15082 + priority: -15090 } symbol { name: "hospital-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -4361,19 +4361,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15918 + priority: 15910 } } element { scale: 19 area { color: 16308697 - priority: -15082 + priority: -15090 } symbol { name: "hospital-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -4381,7 +4381,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15918 + priority: 15910 } } } @@ -4391,7 +4391,7 @@ cont { scale: 18 symbol { name: "hunting-tower-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -4399,14 +4399,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "hunting-tower-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -4414,7 +4414,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -4424,7 +4424,7 @@ cont { scale: 17 symbol { name: "kindergarten-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -4432,14 +4432,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "kindergarten-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -4447,14 +4447,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "kindergarten-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -4462,7 +4462,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -4473,7 +4473,7 @@ cont { symbol { name: "library-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } caption { primary { @@ -4481,7 +4481,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { @@ -4489,7 +4489,7 @@ cont { symbol { name: "library-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } caption { primary { @@ -4497,7 +4497,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -4507,7 +4507,7 @@ cont { scale: 16 symbol { name: "marketplace-m" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -4516,14 +4516,14 @@ cont { color: 4473924 offset_y: 11 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "marketplace-l" - priority: 16540 + priority: 16594 min_distance: 8 } caption { @@ -4532,14 +4532,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "marketplace-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -4547,14 +4547,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "marketplace-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -4562,7 +4562,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -4572,7 +4572,7 @@ cont { scale: 16 symbol { name: "bar-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -4580,14 +4580,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 17 symbol { name: "bar-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -4595,14 +4595,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 18 symbol { name: "bar-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -4610,14 +4610,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "bar-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -4625,7 +4625,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -4635,18 +4635,18 @@ cont { scale: 15 area { color: 15921870 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-s" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -4654,22 +4654,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -4677,18 +4677,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -4696,7 +4696,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -4706,18 +4706,18 @@ cont { scale: 15 area { color: 15921870 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-s" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -4725,22 +4725,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -4748,18 +4748,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -4767,7 +4767,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -4777,18 +4777,18 @@ cont { scale: 15 area { color: 15921870 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-s" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -4796,22 +4796,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -4819,18 +4819,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -4838,7 +4838,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -4848,18 +4848,18 @@ cont { scale: 15 area { color: 15921870 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-s" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -4867,22 +4867,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -4890,18 +4890,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -4909,7 +4909,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -4919,18 +4919,18 @@ cont { scale: 15 area { color: 15921870 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-s" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -4938,22 +4938,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -4961,18 +4961,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -4980,7 +4980,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -4990,18 +4990,18 @@ cont { scale: 15 area { color: 15921870 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-s" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -5009,22 +5009,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5032,18 +5032,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5051,7 +5051,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -5061,18 +5061,18 @@ cont { scale: 15 area { color: 15921870 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "zero-icon" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -5080,22 +5080,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "zero-icon" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5103,18 +5103,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5122,7 +5122,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -5132,18 +5132,18 @@ cont { scale: 15 area { color: 15921870 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "zero-icon" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -5151,22 +5151,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "zero-icon" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5174,18 +5174,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5193,7 +5193,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -5203,18 +5203,18 @@ cont { scale: 15 area { color: 15921870 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "zero-icon" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -5222,22 +5222,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "zero-icon" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5245,18 +5245,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5264,7 +5264,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -5274,18 +5274,18 @@ cont { scale: 15 area { color: 15921870 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-s" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -5293,22 +5293,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5316,18 +5316,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5335,7 +5335,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -5345,18 +5345,18 @@ cont { scale: 15 area { color: 15921870 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-s" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -5364,22 +5364,22 @@ cont { scale: 17 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5387,18 +5387,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 15921870 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5406,7 +5406,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -5416,7 +5416,7 @@ cont { scale: 16 symbol { name: "pharmacy-m" - priority: 16918 + priority: 16910 min_distance: 20 } } @@ -5424,7 +5424,7 @@ cont { scale: 17 symbol { name: "pharmacy-l" - priority: 16918 + priority: 16910 min_distance: 20 } caption { @@ -5433,14 +5433,14 @@ cont { color: 4473924 offset_y: 8 } - priority: 15918 + priority: 15910 } } element { scale: 18 symbol { name: "pharmacy-l" - priority: 16918 + priority: 16910 } caption { primary { @@ -5448,14 +5448,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15918 + priority: 15910 } } element { scale: 19 symbol { name: "pharmacy-l" - priority: 16918 + priority: 16910 } caption { primary { @@ -5463,7 +5463,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15918 + priority: 15910 } } } @@ -5473,7 +5473,7 @@ cont { scale: 14 symbol { name: "place-of-worship-s" - priority: 16855 + priority: 16841 min_distance: 12 } caption { @@ -5482,14 +5482,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15855 + priority: 15841 } } element { scale: 15 symbol { name: "place-of-worship-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5498,18 +5498,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 16 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "place-of-worship-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5518,18 +5518,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 17 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "place-of-worship-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5537,18 +5537,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 18 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "place-of-worship-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5556,18 +5556,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 19 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "place-of-worship-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5575,7 +5575,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } } @@ -5585,7 +5585,7 @@ cont { scale: 14 symbol { name: "buddhist-s" - priority: 16855 + priority: 16841 min_distance: 12 } caption { @@ -5594,14 +5594,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15855 + priority: 15841 } } element { scale: 15 symbol { name: "buddhist-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5610,18 +5610,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 16 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "buddhist-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5630,18 +5630,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 17 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "buddhist-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5649,18 +5649,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 18 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "buddhist-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5668,18 +5668,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 19 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "buddhist-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5687,7 +5687,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } } @@ -5697,7 +5697,7 @@ cont { scale: 14 symbol { name: "christian-s" - priority: 16855 + priority: 16841 min_distance: 12 } caption { @@ -5706,14 +5706,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15855 + priority: 15841 } } element { scale: 15 symbol { name: "christian-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5722,18 +5722,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 16 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "christian-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5742,18 +5742,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 17 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "christian-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5761,18 +5761,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 18 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "christian-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5780,18 +5780,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 19 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "christian-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5799,7 +5799,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } } @@ -5809,7 +5809,7 @@ cont { scale: 14 symbol { name: "hindu-s" - priority: 16855 + priority: 16841 min_distance: 12 } caption { @@ -5818,14 +5818,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15855 + priority: 15841 } } element { scale: 15 symbol { name: "hindu-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5834,18 +5834,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 16 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "hindu-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5854,18 +5854,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 17 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "hindu-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5873,18 +5873,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 18 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "hindu-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5892,18 +5892,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 19 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "hindu-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5911,7 +5911,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } } @@ -5921,7 +5921,7 @@ cont { scale: 14 symbol { name: "jewish-s" - priority: 16855 + priority: 16841 min_distance: 12 } caption { @@ -5930,14 +5930,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15855 + priority: 15841 } } element { scale: 15 symbol { name: "jewish-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5946,18 +5946,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 16 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "jewish-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5966,18 +5966,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 17 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "jewish-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5985,18 +5985,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 18 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "jewish-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6004,18 +6004,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 19 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "jewish-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6023,7 +6023,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } } @@ -6033,7 +6033,7 @@ cont { scale: 14 symbol { name: "muslim-s" - priority: 16855 + priority: 16841 min_distance: 12 } caption { @@ -6042,14 +6042,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15855 + priority: 15841 } } element { scale: 15 symbol { name: "muslim-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -6058,18 +6058,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 16 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "muslim-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -6078,18 +6078,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 17 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "muslim-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6097,18 +6097,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 18 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "muslim-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6116,18 +6116,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 19 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "muslim-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6135,7 +6135,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } } @@ -6145,7 +6145,7 @@ cont { scale: 14 symbol { name: "shinto-s" - priority: 16855 + priority: 16841 min_distance: 12 } caption { @@ -6154,14 +6154,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15855 + priority: 15841 } } element { scale: 15 symbol { name: "shinto-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -6170,18 +6170,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 16 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "shinto-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -6190,18 +6190,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 17 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "shinto-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6209,18 +6209,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 18 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "shinto-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6228,18 +6228,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 19 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "shinto-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6247,7 +6247,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } } @@ -6257,7 +6257,7 @@ cont { scale: 14 symbol { name: "taoist-s" - priority: 16855 + priority: 16841 min_distance: 12 } caption { @@ -6266,14 +6266,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15855 + priority: 15841 } } element { scale: 15 symbol { name: "taoist-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -6282,18 +6282,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 16 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "taoist-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -6302,18 +6302,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 17 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "taoist-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6321,18 +6321,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 18 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "taoist-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6340,18 +6340,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 19 area { color: 15591638 - priority: -15145 + priority: -15159 } symbol { name: "taoist-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6359,7 +6359,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } } @@ -6369,7 +6369,7 @@ cont { scale: 17 symbol { name: "police-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -6377,14 +6377,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "police-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -6392,14 +6392,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "police-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -6407,7 +6407,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -6417,7 +6417,7 @@ cont { scale: 18 symbol { name: "postbox-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -6425,14 +6425,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "postbox-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -6440,7 +6440,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -6451,7 +6451,7 @@ cont { symbol { name: "mail-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -6459,7 +6459,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -6467,7 +6467,7 @@ cont { symbol { name: "mail-m" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -6475,7 +6475,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -6483,7 +6483,7 @@ cont { symbol { name: "mail-m" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -6491,7 +6491,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -6501,7 +6501,7 @@ cont { scale: 15 symbol { name: "beer-m" - priority: 16612 + priority: 16673 min_distance: 28 } caption { @@ -6510,14 +6510,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15612 + priority: 15673 } } element { scale: 16 symbol { name: "beer-m" - priority: 16612 + priority: 16673 min_distance: 12 } caption { @@ -6526,14 +6526,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15612 + priority: 15673 } } element { scale: 17 symbol { name: "beer-l" - priority: 16612 + priority: 16673 min_distance: 12 } caption { @@ -6542,14 +6542,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15612 + priority: 15673 } } element { scale: 18 symbol { name: "beer-l" - priority: 16612 + priority: 16673 } caption { primary { @@ -6557,14 +6557,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15612 + priority: 15673 } } element { scale: 19 symbol { name: "beer-l" - priority: 16612 + priority: 16673 } caption { primary { @@ -6572,7 +6572,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15612 + priority: 15673 } } } @@ -6596,7 +6596,7 @@ cont { scale: 17 symbol { name: "recycling-l" - priority: 16531 + priority: 16584 min_distance: 30 } } @@ -6604,7 +6604,7 @@ cont { scale: 18 symbol { name: "recycling-l" - priority: 16531 + priority: 16584 min_distance: 30 } } @@ -6612,7 +6612,7 @@ cont { scale: 19 symbol { name: "recycling-l" - priority: 16531 + priority: 16584 min_distance: 30 } caption { @@ -6621,7 +6621,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -6631,7 +6631,7 @@ cont { scale: 15 symbol { name: "restaurant-m" - priority: 16639 + priority: 16702 min_distance: 28 } caption { @@ -6640,14 +6640,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15639 + priority: 15702 } } element { scale: 16 symbol { name: "restaurant-m" - priority: 16639 + priority: 16702 min_distance: 12 } caption { @@ -6656,14 +6656,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15639 + priority: 15702 } } element { scale: 17 symbol { name: "restaurant-l" - priority: 16639 + priority: 16702 min_distance: 12 } caption { @@ -6672,14 +6672,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15639 + priority: 15702 } } element { scale: 18 symbol { name: "restaurant-l" - priority: 16639 + priority: 16702 } caption { primary { @@ -6687,14 +6687,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15639 + priority: 15702 } } element { scale: 19 symbol { name: "restaurant-l" - priority: 16639 + priority: 16702 } caption { primary { @@ -6702,7 +6702,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15639 + priority: 15702 } } } @@ -6712,7 +6712,7 @@ cont { scale: 17 symbol { name: "school-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -6720,14 +6720,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 18 symbol { name: "school-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -6735,14 +6735,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "school-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -6750,7 +6750,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -6760,7 +6760,7 @@ cont { scale: 16 symbol { name: "picnic-m" - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -6769,14 +6769,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 17 symbol { name: "picnic-l" - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -6785,14 +6785,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 18 symbol { name: "picnic-l" - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -6801,14 +6801,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "picnic-l" - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -6817,7 +6817,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -6841,7 +6841,7 @@ cont { scale: 16 symbol { name: "taxi-m" - priority: 16540 + priority: 16594 min_distance: 30 } caption { @@ -6850,14 +6850,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "taxi-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -6866,14 +6866,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "taxi-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -6881,14 +6881,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "taxi-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -6896,7 +6896,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -6907,7 +6907,7 @@ cont { symbol { name: "phone-l" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 30 } } @@ -6916,7 +6916,7 @@ cont { symbol { name: "phone-l" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 30 } } @@ -6925,7 +6925,7 @@ cont { symbol { name: "phone-l" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 30 } caption { @@ -6934,7 +6934,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -6944,7 +6944,7 @@ cont { scale: 14 symbol { name: "theatre-s" - priority: 16648 + priority: 16712 min_distance: 8 } caption { @@ -6953,7 +6953,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15648 + priority: 15712 } } element { @@ -6964,14 +6964,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15648 + priority: 15712 } } element { scale: 16 symbol { name: "theatre-m" - priority: 16648 + priority: 16712 min_distance: 10 } caption { @@ -6980,14 +6980,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15648 + priority: 15712 } } element { scale: 17 symbol { name: "theatre-l" - priority: 16648 + priority: 16712 } caption { primary { @@ -6995,14 +6995,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15648 + priority: 15712 } } element { scale: 18 symbol { name: "theatre-l" - priority: 16648 + priority: 16712 } caption { primary { @@ -7010,14 +7010,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15648 + priority: 15712 } } element { scale: 19 symbol { name: "theatre-l" - priority: 16648 + priority: 16712 } caption { primary { @@ -7025,7 +7025,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15648 + priority: 15712 } } } @@ -7035,7 +7035,7 @@ cont { scale: 18 symbol { name: "toilets-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -7043,14 +7043,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "toilets-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -7058,7 +7058,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -7289,7 +7289,7 @@ cont { scale: 17 symbol { name: "vending-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7298,14 +7298,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "vending-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7314,14 +7314,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "vending-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7330,7 +7330,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -7340,7 +7340,7 @@ cont { scale: 17 symbol { name: "vending-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7349,14 +7349,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "vending-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7365,14 +7365,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "vending-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7381,7 +7381,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -7391,7 +7391,7 @@ cont { scale: 17 symbol { name: "parking-meter-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7400,14 +7400,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "parking-meter-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7416,14 +7416,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "parking-meter-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7432,7 +7432,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -7442,7 +7442,7 @@ cont { scale: 17 symbol { name: "vending-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7451,14 +7451,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "vending-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7467,14 +7467,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "vending-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7483,7 +7483,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -7493,7 +7493,7 @@ cont { scale: 16 symbol { name: "veterinary-m" - priority: 16540 + priority: 16594 } caption { primary { @@ -7501,14 +7501,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "veterinary-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -7516,14 +7516,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "veterinary-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -7531,14 +7531,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "veterinary-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -7546,7 +7546,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -7557,7 +7557,7 @@ cont { symbol { name: "waste-basket-s" apply_for_type: 1 - priority: 16522 + priority: 16574 } } element { @@ -7565,7 +7565,7 @@ cont { symbol { name: "waste-basket-s" apply_for_type: 1 - priority: 16522 + priority: 16574 } caption { primary { @@ -7573,7 +7573,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15522 + priority: 15574 } } } @@ -7583,7 +7583,7 @@ cont { scale: 18 symbol { name: "recycling-l" - priority: 16522 + priority: 16574 } caption { primary { @@ -7591,14 +7591,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15522 + priority: 15574 } } element { scale: 19 symbol { name: "recycling-l" - priority: 16522 + priority: 16574 } caption { primary { @@ -7606,7 +7606,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15522 + priority: 15574 } } } @@ -7616,77 +7616,77 @@ cont { scale: 14 area { color: 15591638 - priority: -15883 + priority: -15872 } } element { scale: 15 area { color: 15591638 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 6710886 } - priority: 15117 + priority: 15128 } } element { scale: 16 area { color: 15920858 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 6710886 } - priority: 15117 + priority: 15128 } } element { scale: 17 area { color: 15920858 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 6710886 } - priority: 15117 + priority: 15128 } } element { scale: 18 area { color: 15920858 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 6710886 } - priority: 15117 + priority: 15128 } } element { scale: 19 area { color: 15920858 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 6710886 } - priority: 15117 + priority: 15128 } } } @@ -7696,42 +7696,42 @@ cont { scale: 14 area { color: 15591638 - priority: -15883 + priority: -15872 } } element { scale: 15 area { color: 15591638 - priority: -15883 + priority: -15872 } } element { scale: 16 area { color: 15920858 - priority: -15883 + priority: -15872 } } element { scale: 17 area { color: 15920858 - priority: -15883 + priority: -15872 } } element { scale: 18 area { color: 15920858 - priority: -15883 + priority: -15872 } } element { scale: 19 area { color: 15920858 - priority: -15883 + priority: -15872 } } } @@ -7741,77 +7741,77 @@ cont { scale: 14 area { color: 15591638 - priority: -15883 + priority: -15872 } } element { scale: 15 area { color: 15591638 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 6710886 } - priority: 15117 + priority: 15128 } } element { scale: 16 area { color: 15920858 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 6710886 } - priority: 15117 + priority: 15128 } } element { scale: 17 area { color: 15920858 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 6710886 } - priority: 15117 + priority: 15128 } } element { scale: 18 area { color: 15920858 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 6710886 } - priority: 15117 + priority: 15128 } } element { scale: 19 area { color: 15920858 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 6710886 } - priority: 15117 + priority: 15128 } } } @@ -7948,7 +7948,7 @@ cont { symbol { name: "bcontrol-m" apply_for_type: 1 - priority: 16603 + priority: 16663 } caption { primary { @@ -7956,7 +7956,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { @@ -7964,7 +7964,7 @@ cont { symbol { name: "bcontrol-m" apply_for_type: 1 - priority: 16603 + priority: 16663 } caption { primary { @@ -7972,7 +7972,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { @@ -7980,7 +7980,7 @@ cont { symbol { name: "bcontrol-l" apply_for_type: 1 - priority: 16603 + priority: 16663 } caption { primary { @@ -7988,7 +7988,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { @@ -7996,7 +7996,7 @@ cont { symbol { name: "bcontrol-l" apply_for_type: 1 - priority: 16603 + priority: 16663 } caption { primary { @@ -8004,7 +8004,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { @@ -8012,7 +8012,7 @@ cont { symbol { name: "bcontrol-l" apply_for_type: 1 - priority: 16603 + priority: 16663 } caption { primary { @@ -8020,7 +8020,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15603 + priority: 15663 } } } @@ -8035,7 +8035,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8049,7 +8049,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8063,7 +8063,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8077,7 +8077,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8157,7 +8157,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8171,7 +8171,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8185,7 +8185,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8199,7 +8199,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8279,7 +8279,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8293,7 +8293,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8307,7 +8307,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8321,7 +8321,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8333,7 +8333,7 @@ cont { scale: 16 symbol { name: "lift_gate-m" - priority: 16540 + priority: 16594 min_distance: 30 } caption { @@ -8342,14 +8342,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "lift_gate-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -8358,14 +8358,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "lift_gate-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -8374,14 +8374,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "lift_gate-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -8390,7 +8390,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -8405,7 +8405,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8419,7 +8419,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8433,7 +8433,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8447,7 +8447,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8522,7 +8522,7 @@ cont { scale: 12 symbol { name: "toll_booth-s" - priority: 16927 + priority: 16920 min_distance: 8 } } @@ -8530,7 +8530,7 @@ cont { scale: 13 symbol { name: "toll_booth-s" - priority: 16927 + priority: 16920 min_distance: 8 } } @@ -8538,7 +8538,7 @@ cont { scale: 14 symbol { name: "toll_booth-s" - priority: 16927 + priority: 16920 min_distance: 8 } caption { @@ -8547,14 +8547,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15927 + priority: 15920 } } element { scale: 15 symbol { name: "toll_booth-m" - priority: 16927 + priority: 16920 min_distance: 8 } caption { @@ -8563,14 +8563,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15927 + priority: 15920 } } element { scale: 16 symbol { name: "toll_booth-m" - priority: 16927 + priority: 16920 min_distance: 8 } caption { @@ -8579,14 +8579,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15927 + priority: 15920 } } element { scale: 17 symbol { name: "toll_booth-m" - priority: 16927 + priority: 16920 min_distance: 8 } caption { @@ -8595,14 +8595,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15927 + priority: 15920 } } element { scale: 18 symbol { name: "toll_booth-m" - priority: 16927 + priority: 16920 min_distance: 8 } caption { @@ -8611,14 +8611,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15927 + priority: 15920 } } element { scale: 19 symbol { name: "toll_booth-m" - priority: 16927 + priority: 16920 min_distance: 8 } caption { @@ -8627,7 +8627,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15927 + priority: 15920 } } } @@ -8642,7 +8642,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8656,7 +8656,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8670,7 +8670,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8684,7 +8684,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8697,7 +8697,7 @@ cont { lines { width: 0.5 color: 1298359132 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8707,7 +8707,7 @@ cont { lines { width: 0.5 color: 862151516 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8717,7 +8717,7 @@ cont { lines { width: 0.6 color: 6513500 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8727,7 +8727,7 @@ cont { lines { width: 0.8 color: 6513500 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8737,7 +8737,7 @@ cont { lines { width: 0.85 color: 6513500 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8747,7 +8747,7 @@ cont { lines { width: 1.0 color: 6513500 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8757,7 +8757,7 @@ cont { lines { width: 1.1 color: 6513500 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8767,7 +8767,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8777,7 +8777,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8787,7 +8787,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8797,7 +8797,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8807,7 +8807,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: BUTTCAP } @@ -8817,7 +8817,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: BUTTCAP } @@ -8827,7 +8827,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: BUTTCAP } @@ -8837,7 +8837,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -8847,7 +8847,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -8857,7 +8857,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -8867,7 +8867,7 @@ cont { lines { width: 1.4 color: 6513500 - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -8884,7 +8884,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8901,7 +8901,7 @@ cont { dd: 1.35 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8915,7 +8915,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8929,7 +8929,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8943,7 +8943,7 @@ cont { dd: 1.44 dd: 1.44 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8957,7 +8957,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8971,7 +8971,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8985,7 +8985,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8999,7 +8999,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9013,7 +9013,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: BUTTCAP } @@ -9027,7 +9027,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: BUTTCAP } @@ -9041,7 +9041,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: BUTTCAP } @@ -9055,7 +9055,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -9069,7 +9069,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -9083,7 +9083,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -9097,7 +9097,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -9114,7 +9114,7 @@ cont { dd: 1.35 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9128,7 +9128,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9142,7 +9142,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9156,7 +9156,7 @@ cont { dd: 1.44 dd: 1.44 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9170,7 +9170,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9184,7 +9184,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9198,7 +9198,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9212,7 +9212,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9226,7 +9226,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: BUTTCAP } @@ -9240,7 +9240,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: BUTTCAP } @@ -9254,7 +9254,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: BUTTCAP } @@ -9268,7 +9268,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -9282,7 +9282,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -9296,7 +9296,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -9310,7 +9310,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -9322,7 +9322,7 @@ cont { scale: 11 symbol { name: "nparkf-s" - priority: 16603 + priority: 16663 min_distance: 20 } } @@ -9330,7 +9330,7 @@ cont { scale: 12 symbol { name: "nparkf-s" - priority: 16603 + priority: 16663 min_distance: 12 } caption { @@ -9340,14 +9340,14 @@ cont { stroke_color: 872415231 offset_y: 6 } - priority: 15603 + priority: 15663 } } element { scale: 13 symbol { name: "nparkf-s" - priority: 16603 + priority: 16663 min_distance: 12 } caption { @@ -9357,18 +9357,18 @@ cont { stroke_color: 872415231 offset_y: 6 } - priority: 15603 + priority: 15663 } } element { scale: 14 area { color: 10400608 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-s" - priority: 16603 + priority: 16663 } caption { primary { @@ -9377,18 +9377,18 @@ cont { stroke_color: 872415231 offset_y: 8 } - priority: 15603 + priority: 15663 } } element { scale: 15 area { color: 10400608 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-m" - priority: 16603 + priority: 16663 } caption { primary { @@ -9397,18 +9397,18 @@ cont { stroke_color: 452984831 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 16 area { color: 10400608 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-m" - priority: 16603 + priority: 16663 } caption { primary { @@ -9417,18 +9417,18 @@ cont { stroke_color: 452984831 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 17 area { color: 10400608 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -9437,18 +9437,18 @@ cont { stroke_color: 452984831 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 18 area { color: 10400608 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -9457,18 +9457,18 @@ cont { stroke_color: 452984831 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 19 area { color: 10400608 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -9477,7 +9477,7 @@ cont { stroke_color: 452984831 offset_y: 10 } - priority: 15603 + priority: 15663 } } } @@ -9487,14 +9487,14 @@ cont { scale: 14 area { color: 2160707771 - priority: 1235 + priority: 1258 } } element { scale: 15 area { color: 1724500155 - priority: 1235 + priority: 1258 } } element { @@ -9505,7 +9505,7 @@ cont { width: 1.0 color: 10592406 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9518,7 +9518,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9529,7 +9529,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9542,7 +9542,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9553,7 +9553,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9566,7 +9566,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9577,7 +9577,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9590,7 +9590,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } } @@ -9609,7 +9609,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9625,7 +9625,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9641,7 +9641,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9657,7 +9657,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } } @@ -9667,14 +9667,14 @@ cont { scale: 14 area { color: 2160707771 - priority: 1235 + priority: 1258 } } element { scale: 15 area { color: 1724500155 - priority: 1235 + priority: 1258 } } element { @@ -9685,7 +9685,7 @@ cont { width: 1.0 color: 10592406 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9698,7 +9698,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9709,7 +9709,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9722,7 +9722,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9733,7 +9733,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9746,7 +9746,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9757,7 +9757,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9770,7 +9770,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } } @@ -9780,14 +9780,14 @@ cont { scale: 14 area { color: 2160707771 - priority: 1235 + priority: 1258 } } element { scale: 15 area { color: 1724500155 - priority: 1235 + priority: 1258 } } element { @@ -9798,7 +9798,7 @@ cont { width: 1.0 color: 10592406 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9811,7 +9811,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9822,7 +9822,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9835,7 +9835,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9846,7 +9846,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9859,7 +9859,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9870,7 +9870,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9883,7 +9883,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } } @@ -9893,29 +9893,29 @@ cont { scale: 13 symbol { name: "train-s" - priority: 16657 + priority: 16722 } } element { scale: 14 area { color: 2160707771 - priority: 1658 + priority: 1723 } symbol { name: "train-s" - priority: 16657 + priority: 16722 } } element { scale: 15 area { color: 1724500155 - priority: 1658 + priority: 1723 } symbol { name: "train-m" - priority: 16657 + priority: 16722 } } element { @@ -9926,11 +9926,11 @@ cont { width: 1.0 color: 10592406 } - priority: 1235 + priority: 1258 } symbol { name: "train-m" - priority: 16234 + priority: 16257 } caption { primary { @@ -9944,7 +9944,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9955,11 +9955,11 @@ cont { width: 1.0 color: 10197647 } - priority: 1235 + priority: 1258 } symbol { name: "train-l" - priority: 16234 + priority: 16257 } caption { primary { @@ -9973,7 +9973,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9984,11 +9984,11 @@ cont { width: 1.0 color: 10197647 } - priority: 1235 + priority: 1258 } symbol { name: "train-l" - priority: 16234 + priority: 16257 } caption { primary { @@ -10002,7 +10002,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -10013,11 +10013,11 @@ cont { width: 1.0 color: 10197647 } - priority: 1235 + priority: 1258 } symbol { name: "train-l" - priority: 16234 + priority: 16257 } caption { primary { @@ -10031,7 +10031,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } } @@ -10045,7 +10045,7 @@ cont { width: 1.0 color: 10592406 } - priority: 1199 + priority: 1218 } } element { @@ -10056,7 +10056,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1199 + priority: 1218 } } element { @@ -10067,7 +10067,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1199 + priority: 1218 } } element { @@ -10078,7 +10078,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1199 + priority: 1218 } } } @@ -10088,7 +10088,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10096,14 +10096,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10111,7 +10111,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10121,7 +10121,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10129,14 +10129,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10144,7 +10144,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10154,7 +10154,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10162,14 +10162,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10177,7 +10177,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10187,7 +10187,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10195,14 +10195,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10210,7 +10210,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10220,7 +10220,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10228,14 +10228,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10243,7 +10243,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10253,7 +10253,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10261,14 +10261,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10276,7 +10276,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10286,7 +10286,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10294,14 +10294,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10309,7 +10309,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10319,7 +10319,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10327,14 +10327,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10342,7 +10342,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10352,7 +10352,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10360,14 +10360,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10375,7 +10375,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10385,7 +10385,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10393,14 +10393,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10408,7 +10408,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10418,7 +10418,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10426,14 +10426,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10441,7 +10441,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10452,7 +10452,7 @@ cont { symbol { name: "phone-l" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 30 } } @@ -10461,7 +10461,7 @@ cont { symbol { name: "phone-l" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 30 } } @@ -10470,7 +10470,7 @@ cont { symbol { name: "phone-l" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 30 } } @@ -10482,7 +10482,7 @@ cont { symbol { name: "entrance-s" apply_for_type: 1 - priority: 16054 + priority: 16059 } caption { primary { @@ -10491,7 +10491,7 @@ cont { offset_x: 10 text: "ref" } - priority: 15054 + priority: 15059 } } element { @@ -10499,7 +10499,7 @@ cont { symbol { name: "entrance-s" apply_for_type: 1 - priority: 16054 + priority: 16059 } caption { primary { @@ -10514,7 +10514,7 @@ cont { offset_y: 10 text: "addr:flats" } - priority: 15054 + priority: 15059 } } } @@ -10529,7 +10529,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: BUTTCAP } @@ -10543,7 +10543,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: BUTTCAP } @@ -10553,7 +10553,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -10565,7 +10565,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10575,7 +10575,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -10587,7 +10587,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10597,7 +10597,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -10609,7 +10609,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10619,7 +10619,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -10631,7 +10631,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10641,7 +10641,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } } @@ -10656,7 +10656,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: BUTTCAP } @@ -10670,7 +10670,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: BUTTCAP } @@ -10680,7 +10680,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -10692,7 +10692,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10702,7 +10702,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -10714,7 +10714,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10724,7 +10724,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -10736,7 +10736,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10746,7 +10746,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -10758,7 +10758,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10768,7 +10768,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } } @@ -10783,7 +10783,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: BUTTCAP } @@ -10797,7 +10797,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: BUTTCAP } @@ -10807,7 +10807,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -10819,7 +10819,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10829,7 +10829,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -10841,7 +10841,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10851,7 +10851,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -10863,7 +10863,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10873,7 +10873,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -10885,7 +10885,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10895,7 +10895,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } } @@ -10910,7 +10910,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: BUTTCAP } @@ -10924,7 +10924,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: BUTTCAP } @@ -10934,7 +10934,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -10946,7 +10946,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10956,7 +10956,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -10968,7 +10968,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10978,7 +10978,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -10990,7 +10990,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -11000,7 +11000,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } element { @@ -11012,7 +11012,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -11022,7 +11022,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16270 + priority: 16297 } } } @@ -11032,14 +11032,14 @@ cont { scale: 16 symbol { name: "bus-m" - priority: 16945 + priority: 16940 } } element { scale: 17 symbol { name: "bus-l" - priority: 16945 + priority: 16940 } caption { primary { @@ -11055,14 +11055,14 @@ cont { offset_y: 20 text: "int_name" } - priority: 15945 + priority: 15940 } } element { scale: 18 symbol { name: "bus-l" - priority: 16945 + priority: 16940 } caption { primary { @@ -11078,14 +11078,14 @@ cont { offset_y: 10 text: "int_name" } - priority: 15945 + priority: 15940 } } element { scale: 19 symbol { name: "bus-l" - priority: 16945 + priority: 16940 } caption { primary { @@ -11101,7 +11101,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15945 + priority: 15940 } } } @@ -11116,7 +11116,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: BUTTCAP } @@ -11130,7 +11130,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: BUTTCAP } @@ -11144,7 +11144,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: BUTTCAP } @@ -11154,7 +11154,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16261 + priority: 16287 } } element { @@ -11166,7 +11166,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -11176,7 +11176,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16261 + priority: 16287 } } element { @@ -11188,7 +11188,7 @@ cont { dd: 10.8 dd: 4.5 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -11198,7 +11198,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16261 + priority: 16287 } } element { @@ -11210,7 +11210,7 @@ cont { dd: 13.5 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -11220,7 +11220,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16261 + priority: 16287 } } element { @@ -11232,7 +11232,7 @@ cont { dd: 18.0 dd: 6.2 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -11242,7 +11242,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16261 + priority: 16287 } } } @@ -11253,7 +11253,7 @@ cont { lines { width: 1.0 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11263,7 +11263,7 @@ cont { lines { width: 1.2 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11273,7 +11273,7 @@ cont { lines { width: 1.4 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11283,7 +11283,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11291,7 +11291,7 @@ cont { lines { width: 1.6 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11301,7 +11301,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11309,7 +11309,7 @@ cont { lines { width: 1.8 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11319,7 +11319,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11327,7 +11327,7 @@ cont { lines { width: 2.0 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11337,7 +11337,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11345,7 +11345,7 @@ cont { lines { width: 2.2 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11355,7 +11355,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } } @@ -11366,7 +11366,7 @@ cont { lines { width: 1.0 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11376,7 +11376,7 @@ cont { lines { width: 1.2 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11386,7 +11386,7 @@ cont { lines { width: 1.4 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11396,7 +11396,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11404,7 +11404,7 @@ cont { lines { width: 1.6 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11414,7 +11414,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11422,7 +11422,7 @@ cont { lines { width: 1.8 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11432,7 +11432,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11440,7 +11440,7 @@ cont { lines { width: 2.0 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11450,7 +11450,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11458,7 +11458,7 @@ cont { lines { width: 2.2 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11468,7 +11468,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } } @@ -11479,7 +11479,7 @@ cont { lines { width: 1.0 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11489,7 +11489,7 @@ cont { lines { width: 1.2 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11499,7 +11499,7 @@ cont { lines { width: 1.4 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11509,7 +11509,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11517,7 +11517,7 @@ cont { lines { width: 1.6 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11527,7 +11527,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11535,7 +11535,7 @@ cont { lines { width: 1.8 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11545,7 +11545,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11553,7 +11553,7 @@ cont { lines { width: 2.0 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11563,7 +11563,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11571,7 +11571,7 @@ cont { lines { width: 2.2 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11581,7 +11581,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } } @@ -11592,7 +11592,7 @@ cont { lines { width: 1.0 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11602,7 +11602,7 @@ cont { lines { width: 1.2 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11612,7 +11612,7 @@ cont { lines { width: 1.4 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11622,7 +11622,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11630,7 +11630,7 @@ cont { lines { width: 1.6 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11640,7 +11640,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11648,7 +11648,7 @@ cont { lines { width: 1.8 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11658,7 +11658,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11666,7 +11666,7 @@ cont { lines { width: 2.0 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11676,7 +11676,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -11684,7 +11684,7 @@ cont { lines { width: 2.2 color: 16746413 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11694,7 +11694,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } } @@ -11709,7 +11709,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -11723,7 +11723,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -11733,7 +11733,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -11745,7 +11745,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -11755,7 +11755,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -11767,7 +11767,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -11777,7 +11777,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -11789,7 +11789,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -11799,7 +11799,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -11811,7 +11811,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -11821,7 +11821,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -11836,7 +11836,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -11850,7 +11850,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -11860,7 +11860,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -11872,7 +11872,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -11882,7 +11882,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -11894,7 +11894,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -11904,7 +11904,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -11916,7 +11916,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -11926,7 +11926,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -11938,7 +11938,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -11948,7 +11948,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -11963,13 +11963,13 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } area { color: 15591638 - priority: -15721 + priority: -15694 } } element { @@ -11981,13 +11981,13 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } area { color: 15591638 - priority: -15721 + priority: -15694 } path_text { primary { @@ -11995,7 +11995,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12007,13 +12007,13 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } area { color: 15920858 - priority: -15721 + priority: -15694 } path_text { primary { @@ -12021,7 +12021,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12033,13 +12033,13 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } area { color: 15920858 - priority: -15721 + priority: -15694 } path_text { primary { @@ -12047,7 +12047,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12059,13 +12059,13 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } area { color: 15920858 - priority: -15721 + priority: -15694 } path_text { primary { @@ -12073,7 +12073,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12085,13 +12085,13 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } area { color: 15920858 - priority: -15721 + priority: -15694 } path_text { primary { @@ -12099,7 +12099,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -12114,7 +12114,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12128,7 +12128,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12138,7 +12138,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12150,7 +12150,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12160,7 +12160,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12172,7 +12172,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12182,7 +12182,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12194,7 +12194,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12204,7 +12204,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12216,7 +12216,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12226,7 +12226,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -12241,7 +12241,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12255,7 +12255,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12265,7 +12265,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12277,7 +12277,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12287,7 +12287,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12299,7 +12299,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12309,7 +12309,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12321,7 +12321,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12331,7 +12331,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12343,7 +12343,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12353,7 +12353,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -12368,7 +12368,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12382,7 +12382,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12392,7 +12392,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12404,7 +12404,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12414,7 +12414,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12426,7 +12426,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12436,7 +12436,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12448,7 +12448,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12458,7 +12458,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12470,7 +12470,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12480,7 +12480,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -12495,7 +12495,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12509,7 +12509,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12519,7 +12519,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12531,7 +12531,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12541,7 +12541,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12553,7 +12553,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12563,7 +12563,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12575,7 +12575,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12585,7 +12585,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12597,7 +12597,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12607,7 +12607,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -12622,7 +12622,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12636,7 +12636,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12646,7 +12646,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12658,7 +12658,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12668,7 +12668,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12680,7 +12680,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12690,7 +12690,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12702,7 +12702,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12712,7 +12712,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12724,7 +12724,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12734,7 +12734,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -12749,7 +12749,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12763,7 +12763,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12773,7 +12773,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12785,7 +12785,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12795,7 +12795,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12807,7 +12807,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12817,7 +12817,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12829,7 +12829,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12839,7 +12839,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12851,7 +12851,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12861,7 +12861,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -12876,7 +12876,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12890,7 +12890,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12900,7 +12900,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12912,7 +12912,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12922,7 +12922,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12934,7 +12934,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12944,7 +12944,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12956,7 +12956,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12966,7 +12966,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -12978,7 +12978,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12988,7 +12988,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -13003,7 +13003,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -13017,7 +13017,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -13027,7 +13027,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -13039,7 +13039,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -13049,7 +13049,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -13057,7 +13057,7 @@ cont { lines { width: 5.8 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -13068,7 +13068,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -13079,7 +13079,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -13089,7 +13089,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -13097,7 +13097,7 @@ cont { lines { width: 7.8 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -13108,7 +13108,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -13119,7 +13119,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -13129,7 +13129,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -13137,7 +13137,7 @@ cont { lines { width: 9.0 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -13148,7 +13148,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -13159,7 +13159,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -13169,7 +13169,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -13184,7 +13184,7 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -13198,7 +13198,7 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -13212,7 +13212,7 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -13226,7 +13226,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -13236,7 +13236,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16297 + priority: 16326 } } element { @@ -13248,7 +13248,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -13258,7 +13258,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16297 + priority: 16326 } } element { @@ -13270,7 +13270,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -13280,7 +13280,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16297 + priority: 16326 } } element { @@ -13292,7 +13292,7 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -13302,7 +13302,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16297 + priority: 16326 } } } @@ -13313,7 +13313,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -13323,7 +13323,7 @@ cont { lines { width: 1.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -13333,7 +13333,7 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -13343,7 +13343,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -13351,7 +13351,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -13361,7 +13361,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -13369,7 +13369,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13379,7 +13379,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -13387,7 +13387,7 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13397,7 +13397,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -13405,7 +13405,7 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13415,7 +13415,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } element { @@ -13423,7 +13423,7 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13433,7 +13433,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } } @@ -13444,7 +13444,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -13454,7 +13454,7 @@ cont { lines { width: 1.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -13464,7 +13464,7 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -13474,7 +13474,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -13482,7 +13482,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -13492,7 +13492,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -13500,7 +13500,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13510,7 +13510,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -13518,7 +13518,7 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13528,7 +13528,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -13536,7 +13536,7 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13546,7 +13546,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } element { @@ -13554,7 +13554,7 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13564,7 +13564,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } } @@ -13575,7 +13575,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -13585,7 +13585,7 @@ cont { lines { width: 1.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -13595,7 +13595,7 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -13605,7 +13605,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -13613,7 +13613,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -13623,7 +13623,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -13635,14 +13635,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1323 + priority: 1355 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.0 color: 16777215 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13652,7 +13652,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -13664,14 +13664,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1323 + priority: 1355 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13681,7 +13681,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -13693,14 +13693,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1323 + priority: 1355 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13710,7 +13710,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } element { @@ -13722,14 +13722,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1323 + priority: 1355 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13739,7 +13739,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } } @@ -13750,7 +13750,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -13760,7 +13760,7 @@ cont { lines { width: 1.1 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -13770,7 +13770,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -13780,7 +13780,7 @@ cont { lines { width: 1.5 color: 16741158 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -13790,13 +13790,13 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 85 text_color: 0 } @@ -13806,7 +13806,7 @@ cont { lines { width: 1.7 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -13816,13 +13816,13 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 0 } @@ -13832,7 +13832,7 @@ cont { lines { width: 1.9 color: 16741158 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -13842,13 +13842,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 0 } @@ -13858,7 +13858,7 @@ cont { lines { width: 2.8 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -13868,13 +13868,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 120 text_color: 0 } @@ -13884,7 +13884,7 @@ cont { lines { width: 3.8 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -13894,13 +13894,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 175 text_color: 0 } @@ -13910,7 +13910,7 @@ cont { lines { width: 4.8 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -13920,13 +13920,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 250 text_color: 0 } @@ -13936,7 +13936,7 @@ cont { lines { width: 6.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -13946,13 +13946,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -13962,7 +13962,7 @@ cont { lines { width: 9.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -13972,13 +13972,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -13988,7 +13988,7 @@ cont { lines { width: 12.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -13998,13 +13998,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -14014,7 +14014,7 @@ cont { lines { width: 15.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -14024,13 +14024,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16396 + priority: 16435 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 350 text_color: 0 } @@ -14043,7 +14043,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14053,7 +14053,7 @@ cont { lines { width: 1.1 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14063,7 +14063,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14073,7 +14073,7 @@ cont { lines { width: 1.5 color: 16741158 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14083,13 +14083,13 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 85 text_color: 0 } @@ -14099,7 +14099,7 @@ cont { lines { width: 1.7 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14109,13 +14109,13 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 0 } @@ -14125,7 +14125,7 @@ cont { lines { width: 1.9 color: 16741158 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14135,13 +14135,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 0 } @@ -14151,21 +14151,21 @@ cont { lines { width: 2.8 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -14175,13 +14175,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 120 text_color: 0 } @@ -14191,21 +14191,21 @@ cont { lines { width: 3.8 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -14215,13 +14215,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 175 text_color: 0 } @@ -14231,21 +14231,21 @@ cont { lines { width: 4.8 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -14255,13 +14255,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 250 text_color: 0 } @@ -14271,21 +14271,21 @@ cont { lines { width: 6.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 12.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.8 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -14295,13 +14295,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -14311,21 +14311,21 @@ cont { lines { width: 9.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 19.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 21.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -14335,13 +14335,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -14351,21 +14351,21 @@ cont { lines { width: 12.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 26.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 28.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -14375,13 +14375,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -14391,21 +14391,21 @@ cont { lines { width: 15.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 32.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 34.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -14415,13 +14415,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16396 + priority: 16435 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 350 text_color: 0 } @@ -14434,7 +14434,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14444,7 +14444,7 @@ cont { lines { width: 1.1 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14454,7 +14454,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14464,7 +14464,7 @@ cont { lines { width: 1.5 color: 16741158 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14474,13 +14474,13 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 85 text_color: 0 } @@ -14490,7 +14490,7 @@ cont { lines { width: 1.7 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14500,13 +14500,13 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 0 } @@ -14520,14 +14520,14 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.9 color: 16557154 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14537,13 +14537,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 0 } @@ -14557,14 +14557,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 2.8 color: 16557154 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -14574,13 +14574,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 120 text_color: 0 } @@ -14594,14 +14594,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.8 color: 16557154 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -14611,13 +14611,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 175 text_color: 0 } @@ -14631,14 +14631,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.8 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -14648,13 +14648,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 250 text_color: 0 } @@ -14668,14 +14668,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -14685,13 +14685,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -14705,14 +14705,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -14722,13 +14722,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -14742,14 +14742,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -14759,13 +14759,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -14779,14 +14779,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 15.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -14796,13 +14796,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16396 + priority: 16435 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 350 text_color: 0 } @@ -14817,7 +14817,7 @@ cont { height: 9 color: 3355443 } - priority: 15423 + priority: 15465 } } element { @@ -14827,7 +14827,7 @@ cont { height: 10 color: 3355443 } - priority: 15423 + priority: 15465 } } element { @@ -14837,7 +14837,7 @@ cont { height: 10 color: 3355443 } - priority: 15423 + priority: 15465 } } element { @@ -14847,7 +14847,7 @@ cont { height: 10 color: 3355443 } - priority: 15423 + priority: 15465 } } element { @@ -14857,7 +14857,7 @@ cont { height: 10 color: 3355443 } - priority: 15423 + priority: 15465 } } } @@ -14871,7 +14871,7 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16387 + priority: 16425 } } element { @@ -14882,7 +14882,7 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16387 + priority: 16425 } } element { @@ -14893,7 +14893,7 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } } element { @@ -14901,7 +14901,7 @@ cont { lines { width: 1.4 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -14911,13 +14911,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 120 text_color: 0 } @@ -14927,7 +14927,7 @@ cont { lines { width: 1.8 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -14937,13 +14937,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 175 text_color: 0 } @@ -14953,7 +14953,7 @@ cont { lines { width: 2.4 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -14963,13 +14963,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 250 text_color: 0 } @@ -14979,7 +14979,7 @@ cont { lines { width: 3.0 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -14989,13 +14989,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -15005,7 +15005,7 @@ cont { lines { width: 4.5 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -15015,13 +15015,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -15031,7 +15031,7 @@ cont { lines { width: 6.0 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -15041,13 +15041,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -15057,7 +15057,7 @@ cont { lines { width: 7.5 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -15067,13 +15067,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 350 text_color: 0 } @@ -15089,7 +15089,7 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16387 + priority: 16425 } } element { @@ -15100,7 +15100,7 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16387 + priority: 16425 } } element { @@ -15111,7 +15111,7 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } } element { @@ -15119,7 +15119,7 @@ cont { lines { width: 1.4 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -15129,13 +15129,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 120 text_color: 0 } @@ -15145,21 +15145,21 @@ cont { lines { width: 1.8 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -15169,13 +15169,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 175 text_color: 0 } @@ -15185,21 +15185,21 @@ cont { lines { width: 2.4 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.8 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 5.6 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -15209,13 +15209,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 250 text_color: 0 } @@ -15225,21 +15225,21 @@ cont { lines { width: 3.0 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 6.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.8 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -15249,13 +15249,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -15265,21 +15265,21 @@ cont { lines { width: 4.5 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 10.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -15289,13 +15289,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -15305,21 +15305,21 @@ cont { lines { width: 6.0 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 14.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 16.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -15329,13 +15329,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -15345,21 +15345,21 @@ cont { lines { width: 7.5 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 17.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 19.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -15369,13 +15369,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 350 text_color: 0 } @@ -15391,7 +15391,7 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16387 + priority: 16425 } } element { @@ -15402,7 +15402,7 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16387 + priority: 16425 } } element { @@ -15413,7 +15413,7 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } } element { @@ -15425,14 +15425,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.4 color: 16557154 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -15442,13 +15442,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 120 text_color: 0 } @@ -15462,14 +15462,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.8 color: 16557154 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -15479,13 +15479,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 175 text_color: 0 } @@ -15499,14 +15499,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 2.4 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -15516,13 +15516,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 250 text_color: 0 } @@ -15536,14 +15536,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -15553,13 +15553,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -15573,14 +15573,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.5 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -15590,13 +15590,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -15610,14 +15610,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -15627,13 +15627,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -15647,14 +15647,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.5 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -15664,13 +15664,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 350 text_color: 0 } @@ -15687,7 +15687,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -15701,7 +15701,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -15711,7 +15711,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -15723,7 +15723,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -15733,7 +15733,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -15745,7 +15745,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -15755,7 +15755,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -15767,7 +15767,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -15777,7 +15777,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -15789,7 +15789,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -15799,7 +15799,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -15814,7 +15814,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -15828,7 +15828,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -15838,7 +15838,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -15850,7 +15850,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -15860,7 +15860,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -15872,7 +15872,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -15882,7 +15882,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -15894,7 +15894,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -15904,7 +15904,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -15916,7 +15916,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -15926,7 +15926,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -15941,7 +15941,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -15955,7 +15955,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -15965,7 +15965,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -15977,7 +15977,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -15987,7 +15987,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -15999,7 +15999,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16009,7 +16009,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16021,7 +16021,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16031,7 +16031,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16043,7 +16043,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16053,7 +16053,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -16068,7 +16068,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16082,7 +16082,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16092,7 +16092,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16104,7 +16104,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16114,7 +16114,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16126,7 +16126,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16136,7 +16136,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16148,7 +16148,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16158,7 +16158,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16170,7 +16170,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16180,7 +16180,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -16195,7 +16195,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16209,7 +16209,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16219,7 +16219,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16231,7 +16231,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16241,7 +16241,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16253,7 +16253,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16263,7 +16263,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16275,7 +16275,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16285,7 +16285,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16297,7 +16297,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16307,7 +16307,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -16322,7 +16322,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16336,7 +16336,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16346,7 +16346,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16358,7 +16358,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16368,7 +16368,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16380,7 +16380,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16390,7 +16390,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16402,7 +16402,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16412,7 +16412,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16424,7 +16424,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16434,7 +16434,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -16449,7 +16449,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16463,7 +16463,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16473,7 +16473,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16485,7 +16485,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16495,7 +16495,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16507,7 +16507,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16517,7 +16517,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16529,7 +16529,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16539,7 +16539,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16551,7 +16551,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16561,7 +16561,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -16576,7 +16576,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16590,7 +16590,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16600,7 +16600,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16612,7 +16612,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16622,7 +16622,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16634,7 +16634,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16644,7 +16644,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16656,7 +16656,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16666,7 +16666,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16678,7 +16678,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16688,7 +16688,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -16703,7 +16703,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16717,7 +16717,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16727,7 +16727,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16739,7 +16739,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16749,7 +16749,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16761,7 +16761,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16771,7 +16771,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16783,7 +16783,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16793,7 +16793,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16805,7 +16805,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16815,7 +16815,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -16830,7 +16830,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16844,7 +16844,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16854,7 +16854,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16866,7 +16866,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16876,7 +16876,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16888,7 +16888,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16898,7 +16898,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16910,7 +16910,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16920,7 +16920,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16932,7 +16932,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16942,7 +16942,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -16957,7 +16957,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16971,7 +16971,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16981,7 +16981,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -16993,7 +16993,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -17003,7 +17003,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -17015,7 +17015,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -17025,7 +17025,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -17037,7 +17037,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -17047,7 +17047,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -17059,7 +17059,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -17069,7 +17069,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -17084,7 +17084,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -17098,7 +17098,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -17108,7 +17108,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -17120,7 +17120,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -17130,7 +17130,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -17138,7 +17138,7 @@ cont { lines { width: 5.0 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -17149,7 +17149,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -17160,7 +17160,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -17170,7 +17170,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -17178,7 +17178,7 @@ cont { lines { width: 7.0 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -17189,7 +17189,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -17200,7 +17200,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -17210,7 +17210,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -17218,7 +17218,7 @@ cont { lines { width: 9.0 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -17229,7 +17229,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -17240,7 +17240,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -17250,7 +17250,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -17265,7 +17265,7 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -17279,7 +17279,7 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -17289,7 +17289,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16297 + priority: 16326 } } element { @@ -17301,7 +17301,7 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -17311,7 +17311,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16297 + priority: 16326 } } element { @@ -17323,7 +17323,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -17333,7 +17333,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16297 + priority: 16326 } } element { @@ -17345,7 +17345,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -17355,7 +17355,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16297 + priority: 16326 } } element { @@ -17367,7 +17367,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -17377,7 +17377,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16297 + priority: 16326 } } element { @@ -17389,7 +17389,7 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -17399,7 +17399,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16297 + priority: 16326 } } } @@ -17414,7 +17414,7 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -17428,13 +17428,13 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } area { color: 15591638 - priority: -15703 + priority: -15674 } path_text { primary { @@ -17442,7 +17442,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16297 + priority: 16326 } } element { @@ -17454,13 +17454,13 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } area { color: 15591638 - priority: -15703 + priority: -15674 } path_text { primary { @@ -17468,7 +17468,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16297 + priority: 16326 } } element { @@ -17480,13 +17480,13 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } area { color: 15920858 - priority: -15703 + priority: -15674 } path_text { primary { @@ -17494,7 +17494,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16297 + priority: 16326 } } element { @@ -17506,13 +17506,13 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } area { color: 15920858 - priority: -15703 + priority: -15674 } path_text { primary { @@ -17520,7 +17520,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16297 + priority: 16326 } } element { @@ -17532,13 +17532,13 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } area { color: 15920858 - priority: -15703 + priority: -15674 } path_text { primary { @@ -17546,7 +17546,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16297 + priority: 16326 } } element { @@ -17558,13 +17558,13 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } area { color: 15920858 - priority: -15703 + priority: -15674 } path_text { primary { @@ -17572,7 +17572,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16297 + priority: 16326 } } } @@ -17587,14 +17587,14 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } @@ -17608,21 +17608,21 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.2 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.6 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -17632,7 +17632,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16297 + priority: 16326 } } element { @@ -17644,21 +17644,21 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -17668,7 +17668,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16297 + priority: 16326 } } element { @@ -17680,21 +17680,21 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 5.2 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -17704,7 +17704,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16297 + priority: 16326 } } element { @@ -17716,21 +17716,21 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 6.4 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -17740,7 +17740,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16297 + priority: 16326 } } element { @@ -17752,21 +17752,21 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.4 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -17776,7 +17776,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16297 + priority: 16326 } } element { @@ -17788,21 +17788,21 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 10.4 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 11.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -17812,7 +17812,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16297 + priority: 16326 } } } @@ -17827,7 +17827,7 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -17841,7 +17841,7 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -17851,7 +17851,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16297 + priority: 16326 } } element { @@ -17863,7 +17863,7 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -17873,7 +17873,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16297 + priority: 16326 } } element { @@ -17885,7 +17885,7 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1296 + priority: 1325 join: ROUNDJOIN cap: BUTTCAP } @@ -17896,7 +17896,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -17906,7 +17906,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16297 + priority: 16326 } } element { @@ -17918,7 +17918,7 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1296 + priority: 1325 join: ROUNDJOIN cap: BUTTCAP } @@ -17929,7 +17929,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -17939,7 +17939,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16297 + priority: 16326 } } element { @@ -17951,7 +17951,7 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1296 + priority: 1325 join: ROUNDJOIN cap: BUTTCAP } @@ -17962,7 +17962,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -17972,7 +17972,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16297 + priority: 16326 } } element { @@ -17984,7 +17984,7 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1296 + priority: 1325 join: ROUNDJOIN cap: BUTTCAP } @@ -17995,7 +17995,7 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -18005,7 +18005,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16297 + priority: 16326 } } } @@ -18016,7 +18016,7 @@ cont { lines { width: 0.9 color: 16746278 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18026,7 +18026,7 @@ cont { lines { width: 0.8 color: 16746278 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18036,7 +18036,7 @@ cont { lines { width: 1.2 color: 16746278 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18046,13 +18046,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 85 text_color: 0 } @@ -18062,7 +18062,7 @@ cont { lines { width: 1.5 color: 16749632 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18072,13 +18072,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 90 text_color: 0 } @@ -18088,7 +18088,7 @@ cont { lines { width: 1.7 color: 16749632 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18098,13 +18098,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 90 text_color: 0 } @@ -18114,7 +18114,7 @@ cont { lines { width: 2.4 color: 16749632 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: BUTTCAP } @@ -18124,13 +18124,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 120 text_color: 0 } @@ -18140,7 +18140,7 @@ cont { lines { width: 3.2 color: 16749632 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: BUTTCAP } @@ -18150,13 +18150,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 175 text_color: 0 } @@ -18166,7 +18166,7 @@ cont { lines { width: 4.2 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: BUTTCAP } @@ -18176,13 +18176,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 250 text_color: 0 } @@ -18192,7 +18192,7 @@ cont { lines { width: 4.8 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } @@ -18202,13 +18202,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 300 text_color: 0 } @@ -18218,7 +18218,7 @@ cont { lines { width: 7.0 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } @@ -18228,13 +18228,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 300 text_color: 0 } @@ -18244,7 +18244,7 @@ cont { lines { width: 10.0 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } @@ -18254,13 +18254,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 300 text_color: 0 } @@ -18270,7 +18270,7 @@ cont { lines { width: 13.0 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } @@ -18280,13 +18280,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 350 text_color: 0 } @@ -18299,7 +18299,7 @@ cont { lines { width: 0.9 color: 16746278 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18309,7 +18309,7 @@ cont { lines { width: 0.8 color: 16746278 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18319,7 +18319,7 @@ cont { lines { width: 1.2 color: 16746278 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18329,13 +18329,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 85 text_color: 0 } @@ -18345,7 +18345,7 @@ cont { lines { width: 1.5 color: 16749632 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18355,13 +18355,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 90 text_color: 0 } @@ -18371,7 +18371,7 @@ cont { lines { width: 1.7 color: 16749632 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18381,13 +18381,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 90 text_color: 0 } @@ -18397,7 +18397,7 @@ cont { lines { width: 2.4 color: 16749632 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: BUTTCAP } @@ -18407,13 +18407,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 120 text_color: 0 } @@ -18423,21 +18423,21 @@ cont { lines { width: 3.2 color: 16749632 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.4 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -18447,13 +18447,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 175 text_color: 0 } @@ -18463,21 +18463,21 @@ cont { lines { width: 4.2 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -18487,13 +18487,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 250 text_color: 0 } @@ -18503,21 +18503,21 @@ cont { lines { width: 4.8 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 9.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -18527,13 +18527,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 300 text_color: 0 } @@ -18543,21 +18543,21 @@ cont { lines { width: 7.0 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 15.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 17.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -18567,13 +18567,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 300 text_color: 0 } @@ -18583,21 +18583,21 @@ cont { lines { width: 10.0 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 22.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 24.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -18607,13 +18607,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 300 text_color: 0 } @@ -18623,21 +18623,21 @@ cont { lines { width: 13.0 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 28.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 30.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -18647,13 +18647,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 350 text_color: 0 } @@ -18666,7 +18666,7 @@ cont { lines { width: 0.9 color: 16746278 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18676,7 +18676,7 @@ cont { lines { width: 0.8 color: 16746278 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18686,7 +18686,7 @@ cont { lines { width: 1.2 color: 16746278 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18696,13 +18696,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 85 text_color: 0 } @@ -18712,7 +18712,7 @@ cont { lines { width: 1.5 color: 16749632 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18722,13 +18722,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 90 text_color: 0 } @@ -18738,7 +18738,7 @@ cont { lines { width: 1.7 color: 16749632 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18748,13 +18748,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 90 text_color: 0 } @@ -18764,7 +18764,7 @@ cont { lines { width: 2.4 color: 16749632 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: BUTTCAP } @@ -18774,13 +18774,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 120 text_color: 0 } @@ -18794,14 +18794,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1377 + priority: 1414 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.2 color: 16557154 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: BUTTCAP } @@ -18811,13 +18811,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 175 text_color: 0 } @@ -18831,14 +18831,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1377 + priority: 1414 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.2 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: BUTTCAP } @@ -18848,13 +18848,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 250 text_color: 0 } @@ -18868,14 +18868,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1377 + priority: 1414 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.8 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } @@ -18885,13 +18885,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 300 text_color: 0 } @@ -18905,14 +18905,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1377 + priority: 1414 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.0 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } @@ -18922,13 +18922,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 300 text_color: 0 } @@ -18942,14 +18942,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1377 + priority: 1414 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.0 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } @@ -18959,13 +18959,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 300 text_color: 0 } @@ -18979,14 +18979,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1377 + priority: 1414 join: ROUNDJOIN cap: BUTTCAP } lines { width: 13.0 color: 16752972 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } @@ -18996,13 +18996,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16378 + priority: 16415 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16378 + priority: 16415 min_distance: 350 text_color: 0 } @@ -19018,7 +19018,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16369 + priority: 16405 } } element { @@ -19029,7 +19029,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16369 + priority: 16405 } } element { @@ -19040,7 +19040,7 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16369 + priority: 16405 } } element { @@ -19051,7 +19051,7 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16369 + priority: 16405 } } element { @@ -19059,7 +19059,7 @@ cont { lines { width: 3.2 color: 16749632 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: BUTTCAP } @@ -19069,13 +19069,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16369 + priority: 16405 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 175 text_color: 0 } @@ -19085,7 +19085,7 @@ cont { lines { width: 4.2 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: BUTTCAP } @@ -19095,13 +19095,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16369 + priority: 16405 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 250 text_color: 0 } @@ -19111,7 +19111,7 @@ cont { lines { width: 4.8 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } @@ -19121,13 +19121,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16369 + priority: 16405 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 300 text_color: 0 } @@ -19137,7 +19137,7 @@ cont { lines { width: 7.0 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } @@ -19147,13 +19147,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16369 + priority: 16405 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 300 text_color: 0 } @@ -19163,7 +19163,7 @@ cont { lines { width: 10.0 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } @@ -19173,13 +19173,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16369 + priority: 16405 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 300 text_color: 0 } @@ -19189,7 +19189,7 @@ cont { lines { width: 13.0 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } @@ -19199,13 +19199,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16369 + priority: 16405 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 350 text_color: 0 } @@ -19221,7 +19221,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16369 + priority: 16405 } } element { @@ -19232,7 +19232,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16369 + priority: 16405 } } element { @@ -19243,7 +19243,7 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16369 + priority: 16405 } } element { @@ -19254,7 +19254,7 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16369 + priority: 16405 } } element { @@ -19262,21 +19262,21 @@ cont { lines { width: 3.2 color: 16749632 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.4 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -19286,13 +19286,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16369 + priority: 16405 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 175 text_color: 0 } @@ -19302,21 +19302,21 @@ cont { lines { width: 4.2 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -19326,13 +19326,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16369 + priority: 16405 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 250 text_color: 0 } @@ -19342,21 +19342,21 @@ cont { lines { width: 4.8 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 9.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -19366,13 +19366,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16369 + priority: 16405 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 300 text_color: 0 } @@ -19382,21 +19382,21 @@ cont { lines { width: 7.0 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 15.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 17.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -19406,13 +19406,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16369 + priority: 16405 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 300 text_color: 0 } @@ -19422,21 +19422,21 @@ cont { lines { width: 10.0 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 22.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 24.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -19446,13 +19446,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16369 + priority: 16405 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 300 text_color: 0 } @@ -19462,21 +19462,21 @@ cont { lines { width: 13.0 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 28.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 30.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -19486,13 +19486,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16369 + priority: 16405 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 350 text_color: 0 } @@ -19508,7 +19508,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16369 + priority: 16405 } } element { @@ -19519,7 +19519,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16369 + priority: 16405 } } element { @@ -19530,7 +19530,7 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16369 + priority: 16405 } } element { @@ -19541,7 +19541,7 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16369 + priority: 16405 } } element { @@ -19553,14 +19553,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1368 + priority: 1404 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.2 color: 16557154 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: BUTTCAP } @@ -19570,13 +19570,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16369 + priority: 16405 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 175 text_color: 0 } @@ -19590,14 +19590,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1368 + priority: 1404 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.2 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: BUTTCAP } @@ -19607,13 +19607,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16369 + priority: 16405 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 250 text_color: 0 } @@ -19627,14 +19627,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1368 + priority: 1404 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.8 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } @@ -19644,13 +19644,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16369 + priority: 16405 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 300 text_color: 0 } @@ -19664,14 +19664,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1368 + priority: 1404 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.0 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } @@ -19681,13 +19681,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16369 + priority: 16405 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 300 text_color: 0 } @@ -19701,14 +19701,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1368 + priority: 1404 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.0 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } @@ -19718,13 +19718,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16369 + priority: 16405 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 300 text_color: 0 } @@ -19738,14 +19738,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1368 + priority: 1404 join: ROUNDJOIN cap: BUTTCAP } lines { width: 13.0 color: 16752972 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } @@ -19755,13 +19755,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16369 + priority: 16405 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16369 + priority: 16405 min_distance: 350 text_color: 0 } @@ -19778,7 +19778,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: BUTTCAP } @@ -19792,7 +19792,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: BUTTCAP } @@ -19806,7 +19806,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: BUTTCAP } @@ -19816,7 +19816,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16261 + priority: 16287 } } element { @@ -19828,7 +19828,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -19838,7 +19838,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16261 + priority: 16287 } } element { @@ -19850,7 +19850,7 @@ cont { dd: 10.8 dd: 4.5 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -19860,7 +19860,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16261 + priority: 16287 } } element { @@ -19872,7 +19872,7 @@ cont { dd: 13.5 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -19882,7 +19882,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16261 + priority: 16287 } } element { @@ -19894,7 +19894,7 @@ cont { dd: 18.0 dd: 6.2 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -19904,7 +19904,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16261 + priority: 16287 } } } @@ -19915,7 +19915,7 @@ cont { lines { width: 1.0 color: 6510384 - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -19925,7 +19925,7 @@ cont { lines { width: 1.5 color: 6510384 - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -19935,7 +19935,7 @@ cont { lines { width: 1.8 color: 6510384 - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -19945,7 +19945,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -19953,7 +19953,7 @@ cont { lines { width: 3.0 color: 6510384 - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -19963,7 +19963,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -19971,7 +19971,7 @@ cont { lines { width: 3.0 color: 6510384 - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -19981,7 +19981,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -19989,7 +19989,7 @@ cont { lines { width: 4.0 color: 6510384 - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -19999,7 +19999,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -20010,7 +20010,7 @@ cont { lines { width: 0.8 color: 16316664 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -20020,7 +20020,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -20030,13 +20030,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 90 text_color: 0 } @@ -20046,7 +20046,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20056,13 +20056,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 120 text_color: 0 } @@ -20072,7 +20072,7 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20082,13 +20082,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 175 text_color: 0 } @@ -20098,7 +20098,7 @@ cont { lines { width: 3.2 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20108,13 +20108,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 250 text_color: 0 } @@ -20124,7 +20124,7 @@ cont { lines { width: 4.4 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20134,13 +20134,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -20150,7 +20150,7 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20160,13 +20160,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -20176,7 +20176,7 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20186,13 +20186,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -20202,7 +20202,7 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20212,13 +20212,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16342 + priority: 16376 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 350 text_color: 0 } @@ -20231,7 +20231,7 @@ cont { lines { width: 0.8 color: 16316664 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -20241,7 +20241,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -20251,13 +20251,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 90 text_color: 0 } @@ -20267,7 +20267,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20277,13 +20277,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 120 text_color: 0 } @@ -20293,7 +20293,7 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20303,13 +20303,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 175 text_color: 0 } @@ -20319,7 +20319,7 @@ cont { lines { width: 3.2 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20329,13 +20329,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 250 text_color: 0 } @@ -20345,7 +20345,7 @@ cont { lines { width: 4.4 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20355,13 +20355,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -20371,7 +20371,7 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20381,13 +20381,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -20397,7 +20397,7 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20407,13 +20407,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -20423,7 +20423,7 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20433,13 +20433,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16342 + priority: 16376 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 350 text_color: 0 } @@ -20452,7 +20452,7 @@ cont { lines { width: 0.8 color: 16316664 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -20462,7 +20462,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -20472,13 +20472,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 90 text_color: 0 } @@ -20488,7 +20488,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20498,13 +20498,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 120 text_color: 0 } @@ -20514,21 +20514,21 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -20538,13 +20538,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 175 text_color: 0 } @@ -20554,21 +20554,21 @@ cont { lines { width: 3.2 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.4 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -20578,13 +20578,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 250 text_color: 0 } @@ -20594,21 +20594,21 @@ cont { lines { width: 4.4 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.8 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.6 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -20618,13 +20618,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -20634,21 +20634,21 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 13.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 15.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -20658,13 +20658,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -20674,21 +20674,21 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 20.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 22.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -20698,13 +20698,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -20714,21 +20714,21 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 26.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 28.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -20738,13 +20738,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16342 + priority: 16376 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 350 text_color: 0 } @@ -20757,7 +20757,7 @@ cont { lines { width: 0.8 color: 16316664 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -20767,7 +20767,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -20777,13 +20777,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 90 text_color: 0 } @@ -20793,7 +20793,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20803,13 +20803,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 120 text_color: 0 } @@ -20819,7 +20819,7 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20829,13 +20829,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 175 text_color: 0 } @@ -20845,7 +20845,7 @@ cont { lines { width: 3.2 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20855,13 +20855,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 250 text_color: 0 } @@ -20875,14 +20875,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1375 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 16777215 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20892,13 +20892,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -20912,14 +20912,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1375 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20929,13 +20929,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -20949,14 +20949,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1375 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20966,13 +20966,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -20986,14 +20986,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1375 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -21003,18 +21003,85 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16342 + priority: 16376 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 350 text_color: 0 } } } +cont { + name: "highway-rest_area" + element { + scale: 16 + symbol { + name: "picnic-m" + priority: 16623 + min_distance: 10 + } + path_text { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 16623 + } + } + element { + scale: 17 + symbol { + name: "picnic-l" + priority: 16623 + min_distance: 10 + } + path_text { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 16623 + } + } + element { + scale: 18 + symbol { + name: "picnic-l" + priority: 16623 + min_distance: 10 + } + path_text { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 16623 + } + } + element { + scale: 19 + symbol { + name: "picnic-l" + priority: 16623 + min_distance: 10 + } + path_text { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 16623 + } + } +} cont { name: "highway-road" element { @@ -21022,7 +21089,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -21032,7 +21099,7 @@ cont { lines { width: 1.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -21042,7 +21109,7 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -21052,7 +21119,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -21060,7 +21127,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -21070,7 +21137,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -21078,7 +21145,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -21088,7 +21155,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -21096,7 +21163,7 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -21106,7 +21173,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -21114,7 +21181,7 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -21124,7 +21191,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } element { @@ -21132,7 +21199,7 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -21142,7 +21209,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } } @@ -21153,7 +21220,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -21163,7 +21230,7 @@ cont { lines { width: 1.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -21173,7 +21240,7 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -21183,7 +21250,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -21191,7 +21258,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -21201,7 +21268,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -21209,21 +21276,21 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -21233,7 +21300,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -21241,21 +21308,21 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 12.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -21265,7 +21332,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -21273,21 +21340,21 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 18.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 18.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -21297,7 +21364,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } element { @@ -21305,21 +21372,21 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 24.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 24.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -21329,7 +21396,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } } @@ -21340,7 +21407,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -21350,7 +21417,7 @@ cont { lines { width: 1.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -21360,7 +21427,7 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -21370,7 +21437,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -21378,7 +21445,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -21388,7 +21455,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -21396,7 +21463,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -21406,7 +21473,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -21414,7 +21481,7 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -21424,7 +21491,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -21432,7 +21499,7 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -21442,7 +21509,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } element { @@ -21450,7 +21517,7 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -21460,7 +21527,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } } @@ -21471,7 +21538,7 @@ cont { lines { width: 1.0 color: 16777215 - priority: 1360 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -21481,7 +21548,7 @@ cont { color: 4473924 stroke_color: 871230427 } - priority: 16360 + priority: 16396 } } element { @@ -21489,7 +21556,7 @@ cont { lines { width: 1.3 color: 16777215 - priority: 1360 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -21499,7 +21566,7 @@ cont { color: 4473924 stroke_color: 871230427 } - priority: 16360 + priority: 16396 } } element { @@ -21507,7 +21574,7 @@ cont { lines { width: 1.6 color: 16777215 - priority: 1360 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -21517,13 +21584,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 90 text_color: 0 } @@ -21533,7 +21600,7 @@ cont { lines { width: 2.2 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: BUTTCAP } @@ -21543,13 +21610,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 120 text_color: 0 } @@ -21559,7 +21626,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: BUTTCAP } @@ -21569,13 +21636,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 175 text_color: 0 } @@ -21585,7 +21652,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: BUTTCAP } @@ -21595,13 +21662,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 250 text_color: 0 } @@ -21611,7 +21678,7 @@ cont { lines { width: 4.8 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } @@ -21621,13 +21688,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 300 text_color: 0 } @@ -21637,7 +21704,7 @@ cont { lines { width: 7.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } @@ -21647,13 +21714,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16360 + priority: 16396 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 300 text_color: 0 } @@ -21663,7 +21730,7 @@ cont { lines { width: 10.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } @@ -21673,13 +21740,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16360 + priority: 16396 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 300 text_color: 0 } @@ -21689,7 +21756,7 @@ cont { lines { width: 13.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } @@ -21699,13 +21766,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16360 + priority: 16396 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 350 text_color: 0 } @@ -21718,7 +21785,7 @@ cont { lines { width: 1.0 color: 16777215 - priority: 1360 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -21728,7 +21795,7 @@ cont { color: 4473924 stroke_color: 871230427 } - priority: 16360 + priority: 16396 } } element { @@ -21736,7 +21803,7 @@ cont { lines { width: 1.3 color: 16777215 - priority: 1360 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -21746,7 +21813,7 @@ cont { color: 4473924 stroke_color: 871230427 } - priority: 16360 + priority: 16396 } } element { @@ -21754,7 +21821,7 @@ cont { lines { width: 1.6 color: 16777215 - priority: 1360 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -21764,13 +21831,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 90 text_color: 0 } @@ -21780,7 +21847,7 @@ cont { lines { width: 2.2 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: BUTTCAP } @@ -21790,13 +21857,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 120 text_color: 0 } @@ -21806,21 +21873,21 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.8 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -21830,13 +21897,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 175 text_color: 0 } @@ -21846,21 +21913,21 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.8 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -21870,13 +21937,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 250 text_color: 0 } @@ -21886,21 +21953,21 @@ cont { lines { width: 4.8 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 9.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -21910,13 +21977,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 300 text_color: 0 } @@ -21926,21 +21993,21 @@ cont { lines { width: 7.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 15.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 17.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -21950,13 +22017,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16360 + priority: 16396 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 300 text_color: 0 } @@ -21966,21 +22033,21 @@ cont { lines { width: 10.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 22.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 24.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -21990,13 +22057,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16360 + priority: 16396 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 300 text_color: 0 } @@ -22006,21 +22073,21 @@ cont { lines { width: 13.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 28.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 30.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -22030,13 +22097,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16360 + priority: 16396 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 350 text_color: 0 } @@ -22049,7 +22116,7 @@ cont { lines { width: 1.0 color: 16777215 - priority: 1360 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -22059,7 +22126,7 @@ cont { color: 4473924 stroke_color: 871230427 } - priority: 16360 + priority: 16396 } } element { @@ -22067,7 +22134,7 @@ cont { lines { width: 1.3 color: 16777215 - priority: 1360 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -22077,7 +22144,7 @@ cont { color: 4473924 stroke_color: 871230427 } - priority: 16360 + priority: 16396 } } element { @@ -22085,7 +22152,7 @@ cont { lines { width: 1.6 color: 16777215 - priority: 1360 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -22095,13 +22162,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 90 text_color: 0 } @@ -22111,7 +22178,7 @@ cont { lines { width: 2.2 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: BUTTCAP } @@ -22121,13 +22188,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 120 text_color: 0 } @@ -22137,7 +22204,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: BUTTCAP } @@ -22147,13 +22214,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 175 text_color: 0 } @@ -22163,7 +22230,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: BUTTCAP } @@ -22173,13 +22240,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 250 text_color: 0 } @@ -22193,14 +22260,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1359 + priority: 1395 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.8 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } @@ -22210,13 +22277,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 300 text_color: 0 } @@ -22230,14 +22297,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1359 + priority: 1395 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } @@ -22247,13 +22314,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16360 + priority: 16396 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 300 text_color: 0 } @@ -22267,14 +22334,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1359 + priority: 1395 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } @@ -22284,13 +22351,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16360 + priority: 16396 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 300 text_color: 0 } @@ -22304,14 +22371,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1359 + priority: 1395 join: ROUNDJOIN cap: BUTTCAP } lines { width: 13.0 color: 16777215 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } @@ -22321,13 +22388,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16360 + priority: 16396 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16360 + priority: 16396 min_distance: 350 text_color: 0 } @@ -22340,7 +22407,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: BUTTCAP } @@ -22350,7 +22417,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: BUTTCAP } @@ -22360,7 +22427,7 @@ cont { lines { width: 4.8 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } @@ -22370,7 +22437,7 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16351 + priority: 16386 } } element { @@ -22378,7 +22445,7 @@ cont { lines { width: 7.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } @@ -22388,7 +22455,7 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16351 + priority: 16386 } } element { @@ -22396,7 +22463,7 @@ cont { lines { width: 10.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } @@ -22406,7 +22473,7 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16351 + priority: 16386 } } element { @@ -22414,7 +22481,7 @@ cont { lines { width: 13.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } @@ -22424,7 +22491,7 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16351 + priority: 16386 } } } @@ -22435,21 +22502,21 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.8 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -22459,21 +22526,21 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.8 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -22483,21 +22550,21 @@ cont { lines { width: 4.8 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 9.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -22507,7 +22574,7 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16351 + priority: 16386 } } element { @@ -22515,21 +22582,21 @@ cont { lines { width: 7.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 15.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 17.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -22539,7 +22606,7 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16351 + priority: 16386 } } element { @@ -22547,21 +22614,21 @@ cont { lines { width: 10.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 22.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 24.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -22571,7 +22638,7 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16351 + priority: 16386 } } element { @@ -22579,21 +22646,21 @@ cont { lines { width: 13.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 28.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 30.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -22603,7 +22670,7 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16351 + priority: 16386 } } } @@ -22614,7 +22681,7 @@ cont { lines { width: 3.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: BUTTCAP } @@ -22624,7 +22691,7 @@ cont { lines { width: 4.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: BUTTCAP } @@ -22638,14 +22705,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1350 + priority: 1385 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.8 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } @@ -22655,7 +22722,7 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16351 + priority: 16386 } } element { @@ -22667,14 +22734,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1350 + priority: 1385 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } @@ -22684,7 +22751,7 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16351 + priority: 16386 } } element { @@ -22696,14 +22763,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1350 + priority: 1385 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } @@ -22713,7 +22780,7 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16351 + priority: 16386 } } element { @@ -22725,14 +22792,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1350 + priority: 1385 join: ROUNDJOIN cap: BUTTCAP } lines { width: 13.0 color: 16777215 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } @@ -22742,7 +22809,7 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16351 + priority: 16386 } } } @@ -22753,7 +22820,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: BUTTCAP } @@ -22763,7 +22830,7 @@ cont { lines { width: 1.6 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -22773,7 +22840,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -22781,7 +22848,7 @@ cont { lines { width: 2.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -22791,7 +22858,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -22799,7 +22866,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -22809,7 +22876,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } element { @@ -22817,7 +22884,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -22827,7 +22894,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } } @@ -22838,7 +22905,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: BUTTCAP } @@ -22848,7 +22915,7 @@ cont { lines { width: 1.6 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -22858,7 +22925,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -22866,7 +22933,7 @@ cont { lines { width: 2.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -22876,7 +22943,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -22884,7 +22951,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -22894,7 +22961,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } element { @@ -22902,7 +22969,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -22912,7 +22979,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } } @@ -22923,7 +22990,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: BUTTCAP } @@ -22933,21 +23000,21 @@ cont { lines { width: 1.6 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 3.2 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.6 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -22957,7 +23024,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -22965,21 +23032,21 @@ cont { lines { width: 2.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 4.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -22989,7 +23056,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -22997,21 +23064,21 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 6.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -23021,7 +23088,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } element { @@ -23029,21 +23096,21 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -23053,7 +23120,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } } @@ -23064,7 +23131,7 @@ cont { lines { width: 1.6 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23074,7 +23141,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23082,7 +23149,7 @@ cont { lines { width: 2.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23092,7 +23159,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23100,7 +23167,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23110,7 +23177,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } element { @@ -23118,7 +23185,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23128,7 +23195,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } } @@ -23139,7 +23206,7 @@ cont { lines { width: 1.6 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23149,7 +23216,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23157,7 +23224,7 @@ cont { lines { width: 2.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23167,7 +23234,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23175,7 +23242,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23185,7 +23252,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } element { @@ -23193,7 +23260,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23203,7 +23270,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } } @@ -23214,21 +23281,21 @@ cont { lines { width: 1.6 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 3.2 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.6 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -23238,7 +23305,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23246,21 +23313,21 @@ cont { lines { width: 2.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 4.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -23270,7 +23337,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23278,21 +23345,21 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 6.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -23302,7 +23369,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } element { @@ -23310,21 +23377,21 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -23334,7 +23401,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } } @@ -23345,7 +23412,7 @@ cont { lines { width: 1.6 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23355,7 +23422,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23363,7 +23430,7 @@ cont { lines { width: 2.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23373,7 +23440,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23381,7 +23448,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23391,7 +23458,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } element { @@ -23399,7 +23466,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23409,7 +23476,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } } @@ -23420,7 +23487,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: BUTTCAP } @@ -23430,7 +23497,7 @@ cont { lines { width: 1.6 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23440,7 +23507,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23448,7 +23515,7 @@ cont { lines { width: 2.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23458,7 +23525,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23466,7 +23533,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23476,7 +23543,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } element { @@ -23484,7 +23551,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23494,7 +23561,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } } @@ -23505,7 +23572,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: BUTTCAP } @@ -23515,7 +23582,7 @@ cont { lines { width: 1.6 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23525,7 +23592,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23533,7 +23600,7 @@ cont { lines { width: 2.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23543,7 +23610,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16288 + priority: 16316 } } element { @@ -23551,7 +23618,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23561,7 +23628,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } element { @@ -23569,7 +23636,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23579,7 +23646,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16288 + priority: 16316 } } } @@ -23590,7 +23657,7 @@ cont { symbol { name: "speedcam-m" apply_for_type: 1 - priority: 16567 + priority: 16623 } } element { @@ -23598,7 +23665,7 @@ cont { symbol { name: "speedcam-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } } element { @@ -23606,7 +23673,7 @@ cont { symbol { name: "speedcam-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } } element { @@ -23614,7 +23681,7 @@ cont { symbol { name: "speedcam-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } } } @@ -23629,7 +23696,7 @@ cont { dd: 1.5 dd: 1.5 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -23639,7 +23706,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -23651,7 +23718,7 @@ cont { dd: 2.3 dd: 2.3 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -23661,7 +23728,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -23673,7 +23740,7 @@ cont { dd: 3.2 dd: 3.2 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -23683,7 +23750,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -23695,7 +23762,7 @@ cont { dd: 4.0 dd: 4.0 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -23705,7 +23772,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } } @@ -23720,7 +23787,7 @@ cont { dd: 1.5 dd: 1.5 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -23730,7 +23797,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -23742,7 +23809,7 @@ cont { dd: 2.3 dd: 2.3 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -23752,7 +23819,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -23764,7 +23831,7 @@ cont { dd: 3.2 dd: 3.2 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -23774,7 +23841,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -23786,7 +23853,7 @@ cont { dd: 4.0 dd: 4.0 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -23796,7 +23863,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } } @@ -23811,7 +23878,7 @@ cont { dd: 1.5 dd: 1.5 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -23821,7 +23888,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -23833,7 +23900,7 @@ cont { dd: 2.3 dd: 2.3 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -23843,7 +23910,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -23855,7 +23922,7 @@ cont { dd: 3.2 dd: 3.2 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -23865,7 +23932,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } element { @@ -23877,7 +23944,7 @@ cont { dd: 4.0 dd: 4.0 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -23887,7 +23954,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16423 + priority: 16465 } } } @@ -23898,7 +23965,7 @@ cont { lines { width: 0.8 color: 16316664 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -23908,7 +23975,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -23918,13 +23985,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 90 text_color: 0 } @@ -23934,7 +24001,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -23944,13 +24011,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 120 text_color: 0 } @@ -23960,7 +24027,7 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -23970,13 +24037,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 175 text_color: 0 } @@ -23986,7 +24053,7 @@ cont { lines { width: 3.2 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -23996,13 +24063,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 250 text_color: 0 } @@ -24012,7 +24079,7 @@ cont { lines { width: 4.4 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -24022,13 +24089,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -24038,7 +24105,7 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -24048,13 +24115,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -24064,7 +24131,7 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -24074,13 +24141,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -24090,7 +24157,7 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -24100,13 +24167,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16342 + priority: 16376 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 350 text_color: 0 } @@ -24119,7 +24186,7 @@ cont { lines { width: 0.8 color: 16316664 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -24129,7 +24196,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -24139,13 +24206,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 90 text_color: 0 } @@ -24155,7 +24222,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -24165,13 +24232,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 120 text_color: 0 } @@ -24181,21 +24248,21 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -24205,13 +24272,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 175 text_color: 0 } @@ -24221,21 +24288,21 @@ cont { lines { width: 3.2 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.4 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -24245,13 +24312,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 250 text_color: 0 } @@ -24261,21 +24328,21 @@ cont { lines { width: 4.4 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.8 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.6 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -24285,13 +24352,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -24301,21 +24368,21 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 13.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 15.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -24325,13 +24392,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -24341,21 +24408,21 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 20.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 22.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -24365,13 +24432,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -24381,21 +24448,21 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 26.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 28.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -24405,13 +24472,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16342 + priority: 16376 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 350 text_color: 0 } @@ -24424,7 +24491,7 @@ cont { lines { width: 0.8 color: 16316664 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -24434,7 +24501,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -24444,13 +24511,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 90 text_color: 0 } @@ -24460,7 +24527,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -24470,13 +24537,13 @@ cont { color: 4473924 stroke_color: 452984831 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 120 text_color: 0 } @@ -24486,7 +24553,7 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -24496,13 +24563,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 175 text_color: 0 } @@ -24512,7 +24579,7 @@ cont { lines { width: 3.2 color: 16316664 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -24522,13 +24589,13 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 250 text_color: 0 } @@ -24542,14 +24609,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1375 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 16777215 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -24559,13 +24626,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -24579,14 +24646,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1375 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -24596,13 +24663,13 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -24616,14 +24683,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1375 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -24633,13 +24700,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 0 } @@ -24653,14 +24720,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1375 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -24670,13 +24737,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16342 + priority: 16376 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16342 + priority: 16376 min_distance: 350 text_color: 0 } @@ -24689,7 +24756,7 @@ cont { lines { width: 3.2 color: 16316664 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: BUTTCAP } @@ -24699,7 +24766,7 @@ cont { lines { width: 4.4 color: 16316664 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } @@ -24709,7 +24776,7 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } @@ -24719,7 +24786,7 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } @@ -24729,7 +24796,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16333 + priority: 16366 } } element { @@ -24737,7 +24804,7 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } @@ -24747,7 +24814,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16333 + priority: 16366 } } } @@ -24758,21 +24825,21 @@ cont { lines { width: 3.2 color: 16316664 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.4 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -24782,21 +24849,21 @@ cont { lines { width: 4.4 color: 16316664 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.8 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.6 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -24806,21 +24873,21 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 13.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 15.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -24830,21 +24897,21 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 20.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 22.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -24854,7 +24921,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16333 + priority: 16366 } } element { @@ -24862,21 +24929,21 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 26.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 28.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -24886,7 +24953,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16333 + priority: 16366 } } } @@ -24897,7 +24964,7 @@ cont { lines { width: 3.2 color: 16316664 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: BUTTCAP } @@ -24911,14 +24978,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1332 + priority: 1365 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 16777215 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } @@ -24932,14 +24999,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1332 + priority: 1365 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } @@ -24953,14 +25020,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1332 + priority: 1365 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } @@ -24970,7 +25037,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16333 + priority: 16366 } } element { @@ -24982,14 +25049,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1332 + priority: 1365 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } @@ -24999,7 +25066,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16333 + priority: 16366 } } } @@ -25014,7 +25081,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25028,7 +25095,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25038,7 +25105,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25050,7 +25117,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25060,7 +25127,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25072,7 +25139,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25082,7 +25149,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25094,7 +25161,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25104,7 +25171,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25116,7 +25183,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25126,7 +25193,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -25141,7 +25208,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25155,7 +25222,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25165,7 +25232,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25177,7 +25244,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25187,7 +25254,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25199,7 +25266,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25209,7 +25276,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25221,7 +25288,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25231,7 +25298,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25243,7 +25310,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25253,7 +25320,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -25268,7 +25335,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25282,7 +25349,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25292,7 +25359,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25304,7 +25371,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25314,7 +25381,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25326,7 +25393,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25336,7 +25403,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25348,7 +25415,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25358,7 +25425,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25370,7 +25437,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25380,7 +25447,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -25395,7 +25462,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25409,7 +25476,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25419,7 +25486,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25431,7 +25498,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25441,7 +25508,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25453,7 +25520,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25463,7 +25530,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25475,7 +25542,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25485,7 +25552,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25497,7 +25564,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25507,7 +25574,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -25522,7 +25589,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25536,7 +25603,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25546,7 +25613,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25558,7 +25625,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25568,7 +25635,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25580,7 +25647,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25590,7 +25657,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25602,7 +25669,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25612,7 +25679,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25624,7 +25691,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25634,7 +25701,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -25649,7 +25716,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25663,7 +25730,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25673,7 +25740,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25685,7 +25752,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25695,7 +25762,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25707,7 +25774,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25717,7 +25784,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25729,7 +25796,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25739,7 +25806,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25751,7 +25818,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25761,7 +25828,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -25776,7 +25843,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25790,7 +25857,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25800,7 +25867,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25812,7 +25879,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25822,7 +25889,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25834,7 +25901,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25844,7 +25911,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25856,7 +25923,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25866,7 +25933,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25878,7 +25945,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25888,7 +25955,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -25903,7 +25970,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25917,7 +25984,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25927,7 +25994,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25939,7 +26006,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25949,7 +26016,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25961,7 +26028,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25971,7 +26038,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -25983,7 +26050,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25993,7 +26060,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26005,7 +26072,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26015,7 +26082,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -26030,7 +26097,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26044,7 +26111,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26054,7 +26121,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26066,7 +26133,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26076,7 +26143,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26088,7 +26155,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26098,7 +26165,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26110,7 +26177,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26120,7 +26187,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26132,7 +26199,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26142,7 +26209,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -26157,7 +26224,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26171,7 +26238,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26181,7 +26248,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26193,7 +26260,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26203,7 +26270,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26215,7 +26282,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26225,7 +26292,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26237,7 +26304,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26247,7 +26314,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26259,7 +26326,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26269,7 +26336,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -26284,7 +26351,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26298,7 +26365,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26308,7 +26375,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26320,7 +26387,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26330,7 +26397,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26342,7 +26409,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26352,7 +26419,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26364,7 +26431,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26374,7 +26441,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26386,7 +26453,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26396,7 +26463,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -26411,7 +26478,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26425,7 +26492,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26435,7 +26502,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26447,7 +26514,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26457,7 +26524,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26469,7 +26536,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26479,7 +26546,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26491,7 +26558,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26501,7 +26568,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26513,7 +26580,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26523,7 +26590,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -26538,7 +26605,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26552,7 +26619,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26562,7 +26629,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26574,7 +26641,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26584,7 +26651,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26596,7 +26663,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26606,7 +26673,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26618,7 +26685,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26628,7 +26695,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26640,7 +26707,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26650,7 +26717,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -26665,7 +26732,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26679,7 +26746,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26689,7 +26756,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26701,7 +26768,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26711,7 +26778,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26723,7 +26790,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26733,7 +26800,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26745,7 +26812,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26755,7 +26822,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26767,7 +26834,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26777,7 +26844,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -26792,7 +26859,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26806,7 +26873,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26816,7 +26883,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26828,7 +26895,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26838,7 +26905,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26850,7 +26917,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26860,7 +26927,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26872,7 +26939,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26882,7 +26949,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26894,7 +26961,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26904,7 +26971,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -26919,7 +26986,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26933,7 +27000,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26943,7 +27010,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26955,7 +27022,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26965,7 +27032,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26977,7 +27044,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26987,7 +27054,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -26999,7 +27066,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -27009,7 +27076,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -27021,7 +27088,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -27031,7 +27098,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -27046,7 +27113,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -27060,7 +27127,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -27070,7 +27137,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -27082,7 +27149,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -27092,7 +27159,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -27104,7 +27171,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -27114,7 +27181,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -27126,7 +27193,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -27136,7 +27203,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } element { @@ -27148,7 +27215,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -27158,7 +27225,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16279 + priority: 16306 } } } @@ -27169,7 +27236,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27179,7 +27246,7 @@ cont { lines { width: 1.1 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27189,7 +27256,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27199,7 +27266,7 @@ cont { lines { width: 1.5 color: 16741158 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27209,13 +27276,13 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 85 text_color: 0 } @@ -27225,7 +27292,7 @@ cont { lines { width: 1.7 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27235,13 +27302,13 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 0 } @@ -27251,7 +27318,7 @@ cont { lines { width: 1.9 color: 16741158 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27261,13 +27328,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 0 } @@ -27277,7 +27344,7 @@ cont { lines { width: 2.8 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -27287,13 +27354,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 120 text_color: 0 } @@ -27303,7 +27370,7 @@ cont { lines { width: 3.8 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -27313,13 +27380,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 175 text_color: 0 } @@ -27329,7 +27396,7 @@ cont { lines { width: 4.8 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -27339,13 +27406,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 250 text_color: 0 } @@ -27355,7 +27422,7 @@ cont { lines { width: 6.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -27365,13 +27432,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -27381,7 +27448,7 @@ cont { lines { width: 9.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -27391,13 +27458,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -27407,7 +27474,7 @@ cont { lines { width: 12.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -27417,13 +27484,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -27433,7 +27500,7 @@ cont { lines { width: 15.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -27443,13 +27510,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16396 + priority: 16435 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 350 text_color: 0 } @@ -27462,7 +27529,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27472,7 +27539,7 @@ cont { lines { width: 1.1 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27482,7 +27549,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27492,7 +27559,7 @@ cont { lines { width: 1.5 color: 16741158 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27502,13 +27569,13 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 85 text_color: 0 } @@ -27518,7 +27585,7 @@ cont { lines { width: 1.7 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27528,13 +27595,13 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 0 } @@ -27544,7 +27611,7 @@ cont { lines { width: 1.9 color: 16741158 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27554,13 +27621,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 0 } @@ -27570,21 +27637,21 @@ cont { lines { width: 2.8 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -27594,13 +27661,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 120 text_color: 0 } @@ -27610,21 +27677,21 @@ cont { lines { width: 3.8 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -27634,13 +27701,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 175 text_color: 0 } @@ -27650,21 +27717,21 @@ cont { lines { width: 4.8 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -27674,13 +27741,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 250 text_color: 0 } @@ -27690,21 +27757,21 @@ cont { lines { width: 6.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 12.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.8 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -27714,13 +27781,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -27730,21 +27797,21 @@ cont { lines { width: 9.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 19.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 21.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -27754,13 +27821,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -27770,21 +27837,21 @@ cont { lines { width: 12.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 26.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 28.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -27794,13 +27861,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -27810,21 +27877,21 @@ cont { lines { width: 15.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 32.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 34.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -27834,13 +27901,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16396 + priority: 16435 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 350 text_color: 0 } @@ -27853,7 +27920,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27863,7 +27930,7 @@ cont { lines { width: 1.1 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27873,7 +27940,7 @@ cont { lines { width: 1.2 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27883,7 +27950,7 @@ cont { lines { width: 1.5 color: 16741158 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27893,13 +27960,13 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 85 text_color: 0 } @@ -27909,7 +27976,7 @@ cont { lines { width: 1.7 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27919,13 +27986,13 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 0 } @@ -27939,14 +28006,14 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.9 color: 16557154 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27956,13 +28023,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 0 } @@ -27976,14 +28043,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 2.8 color: 16557154 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -27993,13 +28060,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 120 text_color: 0 } @@ -28013,14 +28080,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.8 color: 16557154 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -28030,13 +28097,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 175 text_color: 0 } @@ -28050,14 +28117,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.8 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -28067,13 +28134,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 250 text_color: 0 } @@ -28087,14 +28154,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -28104,13 +28171,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -28124,14 +28191,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -28141,13 +28208,13 @@ cont { color: 2236962 stroke_color: 872415231 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -28161,14 +28228,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -28178,13 +28245,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 0 } @@ -28198,14 +28265,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 15.0 color: 16742950 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -28215,13 +28282,13 @@ cont { color: 2236962 stroke_color: 16777215 } - priority: 16396 + priority: 16435 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16396 + priority: 16435 min_distance: 350 text_color: 0 } @@ -28237,7 +28304,7 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16387 + priority: 16425 } } element { @@ -28248,7 +28315,7 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16387 + priority: 16425 } } element { @@ -28259,7 +28326,7 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } } element { @@ -28267,7 +28334,7 @@ cont { lines { width: 1.4 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -28277,13 +28344,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 120 text_color: 0 } @@ -28293,7 +28360,7 @@ cont { lines { width: 1.8 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -28303,13 +28370,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 175 text_color: 0 } @@ -28319,7 +28386,7 @@ cont { lines { width: 2.4 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -28329,13 +28396,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 250 text_color: 0 } @@ -28345,7 +28412,7 @@ cont { lines { width: 3.0 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -28355,13 +28422,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -28371,7 +28438,7 @@ cont { lines { width: 4.5 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -28381,13 +28448,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -28397,7 +28464,7 @@ cont { lines { width: 6.0 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -28407,13 +28474,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -28423,7 +28490,7 @@ cont { lines { width: 7.5 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -28433,13 +28500,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 350 text_color: 0 } @@ -28455,7 +28522,7 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16387 + priority: 16425 } } element { @@ -28466,7 +28533,7 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16387 + priority: 16425 } } element { @@ -28477,7 +28544,7 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } } element { @@ -28485,7 +28552,7 @@ cont { lines { width: 1.4 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -28495,13 +28562,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 120 text_color: 0 } @@ -28511,21 +28578,21 @@ cont { lines { width: 1.8 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -28535,13 +28602,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 175 text_color: 0 } @@ -28551,21 +28618,21 @@ cont { lines { width: 2.4 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.8 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 5.6 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -28575,13 +28642,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 250 text_color: 0 } @@ -28591,21 +28658,21 @@ cont { lines { width: 3.0 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 6.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.8 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -28615,13 +28682,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -28631,21 +28698,21 @@ cont { lines { width: 4.5 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 10.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -28655,13 +28722,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -28671,21 +28738,21 @@ cont { lines { width: 6.0 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 14.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 16.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -28695,13 +28762,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -28711,21 +28778,21 @@ cont { lines { width: 7.5 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 17.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 19.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -28735,13 +28802,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 350 text_color: 0 } @@ -28757,7 +28824,7 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16387 + priority: 16425 } } element { @@ -28768,7 +28835,7 @@ cont { color: 2236962 stroke_color: 871230427 } - priority: 16387 + priority: 16425 } } element { @@ -28779,7 +28846,7 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } } element { @@ -28791,14 +28858,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.4 color: 16557154 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -28808,13 +28875,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 120 text_color: 0 } @@ -28828,14 +28895,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.8 color: 16557154 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -28845,13 +28912,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 175 text_color: 0 } @@ -28865,14 +28932,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 2.4 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -28882,13 +28949,13 @@ cont { color: 3355443 stroke_color: 451800027 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 250 text_color: 0 } @@ -28902,14 +28969,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -28919,13 +28986,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -28939,14 +29006,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.5 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -28956,13 +29023,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -28976,14 +29043,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -28993,13 +29060,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 0 } @@ -29013,14 +29080,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.5 color: 16742950 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -29030,13 +29097,13 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16387 + priority: 16425 } shield { height: 11 color: 16777215 stroke_color: 0 - priority: 16387 + priority: 16425 min_distance: 350 text_color: 0 } @@ -29049,7 +29116,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -29059,7 +29126,7 @@ cont { lines { width: 1.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29069,7 +29136,7 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29079,7 +29146,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -29087,7 +29154,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29097,7 +29164,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -29105,7 +29172,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29115,7 +29182,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -29123,7 +29190,7 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29133,7 +29200,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -29141,7 +29208,7 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29151,7 +29218,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } element { @@ -29159,7 +29226,7 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29169,7 +29236,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } } @@ -29180,7 +29247,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -29190,7 +29257,7 @@ cont { lines { width: 1.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29200,7 +29267,7 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29210,7 +29277,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -29218,7 +29285,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29228,7 +29295,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -29236,7 +29303,7 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29246,7 +29313,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -29254,7 +29321,7 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29264,7 +29331,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -29272,7 +29339,7 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29282,7 +29349,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } element { @@ -29290,7 +29357,7 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29300,7 +29367,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } } @@ -29311,7 +29378,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -29321,7 +29388,7 @@ cont { lines { width: 1.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29331,21 +29398,21 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -29355,7 +29422,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -29363,21 +29430,21 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.8 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -29387,7 +29454,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -29395,21 +29462,21 @@ cont { lines { width: 4.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.8 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -29419,7 +29486,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -29427,21 +29494,21 @@ cont { lines { width: 6.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 13.6 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 15.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -29451,7 +29518,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -29459,21 +29526,21 @@ cont { lines { width: 9.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 20.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 22.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -29483,7 +29550,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } element { @@ -29491,21 +29558,21 @@ cont { lines { width: 12.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 26.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 28.0 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -29515,7 +29582,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } } @@ -29526,7 +29593,7 @@ cont { lines { width: 1.2 color: 16316664 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -29536,7 +29603,7 @@ cont { lines { width: 1.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29546,7 +29613,7 @@ cont { lines { width: 1.8 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29556,7 +29623,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -29564,7 +29631,7 @@ cont { lines { width: 3.0 color: 16316664 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29574,7 +29641,7 @@ cont { color: 3355443 stroke_color: 871230427 } - priority: 16324 + priority: 16356 } } element { @@ -29586,14 +29653,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1323 + priority: 1355 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.0 color: 16777215 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29603,7 +29670,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -29615,14 +29682,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1323 + priority: 1355 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 16777215 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29632,7 +29699,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 16324 + priority: 16356 } } element { @@ -29644,14 +29711,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1323 + priority: 1355 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.0 color: 16777215 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29661,7 +29728,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } element { @@ -29673,14 +29740,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1323 + priority: 1355 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.0 color: 16777215 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29690,7 +29757,7 @@ cont { color: 3355443 stroke_color: 16777215 } - priority: 16324 + priority: 16356 } } } @@ -29701,7 +29768,7 @@ cont { lines { width: 0.5 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -29711,7 +29778,7 @@ cont { lines { width: 0.7 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -29721,7 +29788,7 @@ cont { lines { width: 0.7 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -29731,7 +29798,7 @@ cont { lines { width: 0.7 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -29741,7 +29808,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -29751,7 +29818,7 @@ cont { lines { width: 0.8 color: 16742950 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -29764,7 +29831,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -29774,7 +29841,7 @@ cont { lines { width: 0.7 color: 16742950 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -29784,7 +29851,7 @@ cont { lines { width: 0.9 color: 16742950 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -29794,7 +29861,7 @@ cont { lines { width: 0.8 color: 16742950 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -29806,7 +29873,7 @@ cont { scale: 17 symbol { name: "remains-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -29814,14 +29881,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "remains-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -29829,14 +29896,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "remains-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -29844,7 +29911,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -29854,7 +29921,7 @@ cont { scale: 16 symbol { name: "monument-m" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -29863,14 +29930,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 17 symbol { name: "monument-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -29879,14 +29946,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "monument-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -29895,14 +29962,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "monument-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -29911,7 +29978,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -29921,7 +29988,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16909 + priority: 16900 min_distance: 12 } caption { @@ -29930,14 +29997,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15909 + priority: 15900 } } element { scale: 13 symbol { name: "remains-s" - priority: 16909 + priority: 16900 min_distance: 12 } caption { @@ -29946,14 +30013,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15909 + priority: 15900 } } element { scale: 14 symbol { name: "remains-s" - priority: 16909 + priority: 16900 min_distance: 12 } caption { @@ -29962,14 +30029,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15909 + priority: 15900 } } element { scale: 15 symbol { name: "remains-m" - priority: 16909 + priority: 16900 min_distance: 5 } caption { @@ -29978,14 +30045,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15909 + priority: 15900 } } element { scale: 16 symbol { name: "remains-m" - priority: 16909 + priority: 16900 } caption { primary { @@ -29993,14 +30060,14 @@ cont { color: 4473924 offset_y: 12 } - priority: 15909 + priority: 15900 } } element { scale: 17 symbol { name: "remains-l" - priority: 16909 + priority: 16900 } caption { primary { @@ -30008,14 +30075,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15909 + priority: 15900 } } element { scale: 18 symbol { name: "remains-l" - priority: 16909 + priority: 16900 } caption { primary { @@ -30023,14 +30090,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15909 + priority: 15900 } } element { scale: 19 symbol { name: "remains-l" - priority: 16909 + priority: 16900 } caption { primary { @@ -30038,7 +30105,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15909 + priority: 15900 } } } @@ -30053,7 +30120,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -30067,7 +30134,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -30081,7 +30148,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -30095,7 +30162,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -30107,7 +30174,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16909 + priority: 16900 min_distance: 12 } caption { @@ -30116,14 +30183,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15909 + priority: 15900 } } element { scale: 13 symbol { name: "remains-s" - priority: 16909 + priority: 16900 min_distance: 12 } caption { @@ -30132,14 +30199,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15909 + priority: 15900 } } element { scale: 14 symbol { name: "remains-s" - priority: 16909 + priority: 16900 min_distance: 12 } caption { @@ -30148,14 +30215,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15909 + priority: 15900 } } element { scale: 15 symbol { name: "remains-m" - priority: 16909 + priority: 16900 min_distance: 5 } caption { @@ -30164,14 +30231,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15909 + priority: 15900 } } element { scale: 16 symbol { name: "remains-m" - priority: 16909 + priority: 16900 } caption { primary { @@ -30179,14 +30246,14 @@ cont { color: 4473924 offset_y: 12 } - priority: 15909 + priority: 15900 } } element { scale: 17 symbol { name: "remains-l" - priority: 16909 + priority: 16900 } caption { primary { @@ -30194,14 +30261,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15909 + priority: 15900 } } element { scale: 18 symbol { name: "remains-l" - priority: 16909 + priority: 16900 } caption { primary { @@ -30209,14 +30276,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15909 + priority: 15900 } } element { scale: 19 symbol { name: "remains-l" - priority: 16909 + priority: 16900 } caption { primary { @@ -30224,7 +30291,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15909 + priority: 15900 } } } @@ -30234,7 +30301,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 16657 + priority: 16722 min_distance: 24 } caption { @@ -30243,14 +30310,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15657 + priority: 15722 } } element { scale: 16 symbol { name: "monument-m" - priority: 16657 + priority: 16722 min_distance: 12 } caption { @@ -30259,14 +30326,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15657 + priority: 15722 } } element { scale: 17 symbol { name: "monument-l" - priority: 16657 + priority: 16722 } caption { primary { @@ -30274,14 +30341,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15657 + priority: 15722 } } element { scale: 18 symbol { name: "monument-l" - priority: 16657 + priority: 16722 } caption { primary { @@ -30289,14 +30356,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15657 + priority: 15722 } } element { scale: 19 symbol { name: "monument-l" - priority: 16657 + priority: 16722 } caption { primary { @@ -30304,7 +30371,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15657 + priority: 15722 } } } @@ -30314,7 +30381,7 @@ cont { scale: 13 symbol { name: "monument-s" - priority: 16657 + priority: 16722 min_distance: 12 } caption { @@ -30323,14 +30390,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15657 + priority: 15722 } } element { scale: 14 symbol { name: "monument-s" - priority: 16657 + priority: 16722 min_distance: 12 } caption { @@ -30339,14 +30406,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15657 + priority: 15722 } } element { scale: 15 symbol { name: "monument-m" - priority: 16657 + priority: 16722 min_distance: 24 } caption { @@ -30355,14 +30422,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15657 + priority: 15722 } } element { scale: 16 symbol { name: "monument-m" - priority: 16657 + priority: 16722 min_distance: 12 } caption { @@ -30371,14 +30438,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15657 + priority: 15722 } } element { scale: 17 symbol { name: "monument-l" - priority: 16657 + priority: 16722 } caption { primary { @@ -30386,14 +30453,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15657 + priority: 15722 } } element { scale: 18 symbol { name: "monument-l" - priority: 16657 + priority: 16722 } caption { primary { @@ -30401,14 +30468,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15657 + priority: 15722 } } element { scale: 19 symbol { name: "monument-l" - priority: 16657 + priority: 16722 } caption { primary { @@ -30416,7 +30483,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15657 + priority: 15722 } } } @@ -30538,7 +30605,7 @@ cont { scale: 16 symbol { name: "historic-ship-m" - priority: 16540 + priority: 16594 min_distance: 8 } caption { @@ -30547,14 +30614,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "historic-ship-l" - priority: 16540 + priority: 16594 min_distance: 8 } caption { @@ -30563,14 +30630,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "historic-ship-l" - priority: 16540 + priority: 16594 min_distance: 8 } caption { @@ -30579,14 +30646,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "historic-ship-l" - priority: 16540 + priority: 16594 min_distance: 8 } caption { @@ -30595,7 +30662,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -30605,7 +30672,7 @@ cont { scale: 16 symbol { name: "tomb-m" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30614,14 +30681,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 17 symbol { name: "tomb-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30630,14 +30697,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "tomb-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30646,14 +30713,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "tomb-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30662,7 +30729,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -30672,7 +30739,7 @@ cont { scale: 16 symbol { name: "monument-m" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30681,14 +30748,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 17 symbol { name: "monument-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30697,14 +30764,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "monument-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30713,14 +30780,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "monument-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30729,7 +30796,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -30739,7 +30806,7 @@ cont { scale: 16 symbol { name: "wayside_shrine-m" - priority: 16531 + priority: 16584 min_distance: 8 } } @@ -30747,7 +30814,7 @@ cont { scale: 17 symbol { name: "wayside_shrine-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30756,14 +30823,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "wayside_shrine-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30772,14 +30839,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "wayside_shrine-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30788,7 +30855,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -30799,7 +30866,7 @@ cont { lines { width: 0 color: 0 - priority: 1423 + priority: 1465 pathsym { name: "arrow-xs" step: 144.0 @@ -30812,7 +30879,7 @@ cont { lines { width: 0 color: 0 - priority: 1423 + priority: 1465 pathsym { name: "arrow-s" step: 144.0 @@ -30825,7 +30892,7 @@ cont { lines { width: 0 color: 0 - priority: 1423 + priority: 1465 pathsym { name: "arrow-s" step: 184.0 @@ -30838,7 +30905,7 @@ cont { lines { width: 0 color: 0 - priority: 1423 + priority: 1465 pathsym { name: "arrow-m" step: 184.0 @@ -30851,7 +30918,7 @@ cont { lines { width: 0 color: 0 - priority: 1423 + priority: 1465 pathsym { name: "arrow-m" step: 184.0 @@ -30866,91 +30933,91 @@ cont { scale: 12 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 13 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 14 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 15 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 16 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 17 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 18 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 19 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } } @@ -30960,56 +31027,56 @@ cont { scale: 12 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 13 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 14 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 15 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 16 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 17 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 18 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 19 area { color: 9163744 - priority: -15856 + priority: -15842 } } } @@ -31019,18 +31086,18 @@ cont { scale: 14 area { color: 666683518 - priority: -15640 + priority: -15604 } } element { scale: 15 area { color: 12372094 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-m" - priority: 16360 + priority: 16396 } caption { primary { @@ -31038,18 +31105,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 16 area { color: 11781233 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-m" - priority: 16360 + priority: 16396 } caption { primary { @@ -31057,18 +31124,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 17 area { color: 11781233 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -31076,18 +31143,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 18 area { color: 11781233 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -31095,18 +31162,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 19 area { color: 11781233 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -31114,7 +31181,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } } @@ -31124,18 +31191,18 @@ cont { scale: 14 area { color: 666683518 - priority: -15640 + priority: -15604 } } element { scale: 15 area { color: 12372094 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-m" - priority: 16360 + priority: 16396 } caption { primary { @@ -31143,18 +31210,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 16 area { color: 11781233 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-m" - priority: 16360 + priority: 16396 } caption { primary { @@ -31162,18 +31229,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 17 area { color: 11781233 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -31181,18 +31248,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 18 area { color: 11781233 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -31200,18 +31267,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 19 area { color: 11781233 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -31219,7 +31286,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15360 + priority: 15396 } } } @@ -31262,70 +31329,70 @@ cont { scale: 15 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 16 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 17 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 18 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 19 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } } @@ -31335,91 +31402,91 @@ cont { scale: 12 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 13 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 14 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 15 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 16 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 17 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 18 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 19 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } } @@ -31429,56 +31496,56 @@ cont { scale: 12 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 13 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 14 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 15 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 16 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 17 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 18 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 19 area { color: 13029267 - priority: -15910 + priority: -15901 } } } @@ -31488,39 +31555,39 @@ cont { scale: 10 area { color: 13029267 - priority: -15928 + priority: -15921 } } element { scale: 11 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 12 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 13 area { color: 11781233 - priority: -15928 + priority: -15921 } } element { scale: 14 area { color: 11453035 - priority: -15928 + priority: -15921 } symbol { name: "park-s" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -31537,7 +31604,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -31545,7 +31612,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -31553,11 +31620,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15928 + priority: -15921 } symbol { name: "park-m" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -31574,7 +31641,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -31582,7 +31649,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -31590,11 +31657,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-m" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -31611,7 +31678,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -31619,7 +31686,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -31627,11 +31694,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -31648,7 +31715,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -31656,7 +31723,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -31664,11 +31731,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -31685,7 +31752,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -31693,11 +31760,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 } apply_if: "!name" } @@ -31705,11 +31772,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -31726,7 +31793,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -31734,11 +31801,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 } apply_if: "!name" } @@ -31749,39 +31816,39 @@ cont { scale: 10 area { color: 13029267 - priority: -15928 + priority: -15921 } } element { scale: 11 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 12 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 13 area { color: 11781233 - priority: -15928 + priority: -15921 } } element { scale: 14 area { color: 11453035 - priority: -15928 + priority: -15921 } symbol { name: "park-s" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -31798,7 +31865,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -31806,7 +31873,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -31814,11 +31881,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15928 + priority: -15921 } symbol { name: "park-m" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -31835,7 +31902,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -31843,7 +31910,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -31851,11 +31918,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-m" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -31872,7 +31939,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -31880,7 +31947,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -31888,11 +31955,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -31909,7 +31976,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -31917,7 +31984,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -31925,11 +31992,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -31946,7 +32013,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -31954,11 +32021,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 } apply_if: "!name" } @@ -31966,11 +32033,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -31987,7 +32054,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -31995,11 +32062,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 } apply_if: "!name" } @@ -32010,39 +32077,39 @@ cont { scale: 10 area { color: 13029267 - priority: -15928 + priority: -15921 } } element { scale: 11 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 12 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 13 area { color: 11781233 - priority: -15928 + priority: -15921 } } element { scale: 14 area { color: 11453035 - priority: -15928 + priority: -15921 } symbol { name: "park-s" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32059,7 +32126,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32067,7 +32134,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -32075,11 +32142,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15928 + priority: -15921 } symbol { name: "park-m" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32096,7 +32163,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32104,7 +32171,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -32112,11 +32179,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-m" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32133,7 +32200,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32141,7 +32208,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -32149,11 +32216,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32170,7 +32237,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32178,7 +32245,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -32186,11 +32253,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32207,7 +32274,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32215,11 +32282,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 } apply_if: "!name" } @@ -32227,11 +32294,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32248,7 +32315,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32256,11 +32323,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 } apply_if: "!name" } @@ -32271,39 +32338,39 @@ cont { scale: 10 area { color: 13029267 - priority: -15928 + priority: -15921 } } element { scale: 11 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 12 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 13 area { color: 11781233 - priority: -15928 + priority: -15921 } } element { scale: 14 area { color: 11453035 - priority: -15928 + priority: -15921 } symbol { name: "park-s" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32320,7 +32387,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32328,7 +32395,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -32336,11 +32403,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15928 + priority: -15921 } symbol { name: "park-m" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32357,7 +32424,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32365,7 +32432,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -32373,11 +32440,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-m" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32394,7 +32461,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32402,7 +32469,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -32410,11 +32477,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32431,7 +32498,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32439,7 +32506,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -32447,11 +32514,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32468,7 +32535,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32476,11 +32543,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 } apply_if: "!name" } @@ -32488,11 +32555,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32509,7 +32576,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32517,11 +32584,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 } apply_if: "!name" } @@ -32532,14 +32599,14 @@ cont { scale: 14 area { color: 2160707771 - priority: 1199 + priority: 1218 } } element { scale: 15 area { color: 1724500155 - priority: 1199 + priority: 1218 } } element { @@ -32550,7 +32617,7 @@ cont { width: 1.0 color: 10592406 } - priority: 1199 + priority: 1218 } } element { @@ -32561,7 +32628,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1199 + priority: 1218 } } element { @@ -32572,7 +32639,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1199 + priority: 1218 } } element { @@ -32583,7 +32650,7 @@ cont { width: 1.0 color: 10197647 } - priority: 1199 + priority: 1218 } } } @@ -32593,56 +32660,56 @@ cont { scale: 12 area { color: 13620648 - priority: -15874 + priority: -15862 } } element { scale: 13 area { color: 13620648 - priority: -15874 + priority: -15862 } } element { scale: 14 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 15 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 16 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 17 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 18 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 19 area { color: 13029267 - priority: -15874 + priority: -15862 } } } @@ -32652,70 +32719,70 @@ cont { scale: 15 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 16 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 17 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 18 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 19 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } } @@ -32725,11 +32792,11 @@ cont { scale: 15 area { color: 15000299 - priority: -15433 + priority: -15377 } symbol { name: "recycling-m" - priority: 16567 + priority: 16623 } caption { primary { @@ -32737,18 +32804,18 @@ cont { color: 4473924 offset_y: 8 } - priority: 15567 + priority: 15623 } } element { scale: 16 area { color: 15000299 - priority: -15433 + priority: -15377 } symbol { name: "recycling-m" - priority: 16567 + priority: 16623 } caption { primary { @@ -32756,18 +32823,18 @@ cont { color: 4473924 offset_y: 8 } - priority: 15567 + priority: 15623 } } element { scale: 17 area { color: 15000299 - priority: -15433 + priority: -15377 } symbol { name: "recycling-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -32775,18 +32842,18 @@ cont { color: 4473924 offset_y: 8 } - priority: 15567 + priority: 15623 } } element { scale: 18 area { color: 15000299 - priority: -15433 + priority: -15377 } symbol { name: "recycling-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -32794,18 +32861,18 @@ cont { color: 4473924 offset_y: 8 } - priority: 15567 + priority: 15623 } } element { scale: 19 area { color: 15000299 - priority: -15433 + priority: -15377 } symbol { name: "recycling-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -32813,7 +32880,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15567 + priority: 15623 } } } @@ -32823,56 +32890,56 @@ cont { scale: 12 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 13 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 14 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 15 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 16 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 17 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 18 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 19 area { color: 13029267 - priority: -15910 + priority: -15901 } } } @@ -32882,25 +32949,25 @@ cont { scale: 14 area { color: 15022389 - priority: -15577 + priority: -15535 } } element { scale: 15 area { color: 15022389 - priority: -15577 + priority: -15535 } } element { scale: 16 area { color: 15022389 - priority: -15577 + priority: -15535 } symbol { name: "military-m" - priority: 16423 + priority: 16465 min_distance: 10 } } @@ -32908,11 +32975,11 @@ cont { scale: 17 area { color: 15022389 - priority: -15577 + priority: -15535 } symbol { name: "military-l" - priority: 16423 + priority: 16465 } caption { primary { @@ -32920,18 +32987,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15423 + priority: 15465 } } element { scale: 18 area { color: 15022389 - priority: -15577 + priority: -15535 } symbol { name: "military-l" - priority: 16423 + priority: 16465 } caption { primary { @@ -32939,18 +33006,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15423 + priority: 15465 } } element { scale: 19 area { color: 15022389 - priority: -15577 + priority: -15535 } symbol { name: "military-l" - priority: 16423 + priority: 16465 } caption { primary { @@ -32958,7 +33025,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15423 + priority: 15465 } } } @@ -32968,91 +33035,91 @@ cont { scale: 12 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 13 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 14 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 15 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 16 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 17 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 18 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 19 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } } @@ -33062,70 +33129,70 @@ cont { scale: 15 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 16 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 17 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 18 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 19 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } } @@ -33135,70 +33202,70 @@ cont { scale: 15 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 16 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 17 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 18 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } element { scale: 19 area { color: 15000299 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 6710886 } - priority: 15027 + priority: 15029 } } } @@ -33208,91 +33275,91 @@ cont { scale: 12 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 13 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 14 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 15 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 16 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 17 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 18 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 19 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } } @@ -33305,7 +33372,7 @@ cont { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33316,7 +33383,7 @@ cont { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33324,14 +33391,14 @@ cont { scale: 12 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33339,7 +33406,7 @@ cont { scale: 12 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -33347,14 +33414,14 @@ cont { scale: 13 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33362,7 +33429,7 @@ cont { scale: 13 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -33370,14 +33437,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33385,7 +33452,7 @@ cont { scale: 14 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -33393,14 +33460,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33408,7 +33475,7 @@ cont { scale: 15 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -33416,14 +33483,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33431,7 +33498,7 @@ cont { scale: 16 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -33439,14 +33506,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33454,7 +33521,7 @@ cont { scale: 17 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -33462,14 +33529,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33477,7 +33544,7 @@ cont { scale: 18 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -33485,14 +33552,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33500,7 +33567,7 @@ cont { scale: 19 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -33511,140 +33578,140 @@ cont { scale: 0 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 1 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 2 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 3 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 4 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 5 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 6 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 7 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 8 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 9 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 10 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 11 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 12 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 13 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 14 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 15 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 16 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 17 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 18 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 19 area { color: 9163744 - priority: -15856 + priority: -15842 } } } @@ -33654,56 +33721,56 @@ cont { scale: 12 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 13 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 14 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 15 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 16 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 17 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 18 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 19 area { color: 13029267 - priority: -15910 + priority: -15901 } } } @@ -33713,91 +33780,91 @@ cont { scale: 12 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 13 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 14 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 15 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 16 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 17 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 18 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } element { scale: 19 area { color: 13029267 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 4473924 } - priority: 15090 + priority: 15099 } } } @@ -33811,7 +33878,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -33822,7 +33889,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -33833,7 +33900,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -33843,7 +33910,7 @@ cont { scale: 16 symbol { name: "dog_park-m" - priority: 16540 + priority: 16594 min_distance: 30 } caption { @@ -33852,14 +33919,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "dog_park-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -33868,14 +33935,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "dog_park-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -33884,14 +33951,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "dog_park-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -33900,7 +33967,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -33910,7 +33977,7 @@ cont { scale: 16 symbol { name: "dog_park-m" - priority: 16540 + priority: 16594 min_distance: 30 } caption { @@ -33919,14 +33986,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "dog_park-l" - priority: 16567 + priority: 16623 min_distance: 20 } caption { @@ -33935,14 +34002,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 18 symbol { name: "dog_park-l" - priority: 16567 + priority: 16623 min_distance: 20 } caption { @@ -33951,14 +34018,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "dog_park-l" - priority: 16567 + priority: 16623 min_distance: 20 } caption { @@ -33967,7 +34034,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -33978,7 +34045,7 @@ cont { symbol { name: "gym-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -33995,7 +34062,7 @@ cont { symbol { name: "gym-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -34012,7 +34079,7 @@ cont { symbol { name: "gym-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -34031,39 +34098,39 @@ cont { scale: 12 area { color: 12372094 - priority: -15919 + priority: -15911 } } element { scale: 13 area { color: 11781233 - priority: -15919 + priority: -15911 } } element { scale: 14 area { color: 11453035 - priority: -15919 + priority: -15911 } } element { scale: 15 area { color: 11584112 - priority: -15919 + priority: -15911 } } element { scale: 16 area { color: 11190117 - priority: -15919 + priority: -15911 } symbol { name: "garden-m" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -34080,7 +34147,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -34088,7 +34155,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -34096,11 +34163,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "garden-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -34117,7 +34184,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -34125,7 +34192,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15955 + priority: -15951 } caption { primary { @@ -34133,7 +34200,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -34141,11 +34208,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "garden-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -34162,7 +34229,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -34170,11 +34237,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "garden-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -34191,7 +34258,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -34202,46 +34269,46 @@ cont { scale: 12 area { color: 13620648 - priority: -15874 + priority: -15862 } } element { scale: 13 area { color: 13620648 - priority: -15874 + priority: -15862 } } element { scale: 14 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 15 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 16 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 17 area { color: 13029267 - priority: -15865 + priority: -15852 } symbol { name: "golf-l" - priority: 16135 + priority: 16148 min_distance: 10 } caption { @@ -34250,18 +34317,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15135 + priority: 15148 } } element { scale: 18 area { color: 13029267 - priority: -15865 + priority: -15852 } symbol { name: "golf-l" - priority: 16135 + priority: 16148 min_distance: 10 } caption { @@ -34270,18 +34337,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15135 + priority: 15148 } } element { scale: 19 area { color: 13029267 - priority: -15865 + priority: -15852 } symbol { name: "golf-l" - priority: 16135 + priority: 16148 min_distance: 10 } caption { @@ -34290,7 +34357,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15135 + priority: 15148 } } } @@ -34304,7 +34371,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -34315,7 +34382,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -34326,7 +34393,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -34336,7 +34403,7 @@ cont { scale: 11 symbol { name: "nparkf-s" - priority: 16603 + priority: 16663 min_distance: 20 } } @@ -34344,7 +34411,7 @@ cont { scale: 12 symbol { name: "nparkf-s" - priority: 16603 + priority: 16663 min_distance: 12 } caption { @@ -34354,14 +34421,14 @@ cont { stroke_color: 872415231 offset_y: 6 } - priority: 15603 + priority: 15663 } } element { scale: 13 symbol { name: "nparkf-s" - priority: 16603 + priority: 16663 min_distance: 12 } caption { @@ -34371,18 +34438,18 @@ cont { stroke_color: 872415231 offset_y: 6 } - priority: 15603 + priority: 15663 } } element { scale: 14 area { color: 10400608 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-s" - priority: 16603 + priority: 16663 } caption { primary { @@ -34391,18 +34458,18 @@ cont { stroke_color: 872415231 offset_y: 8 } - priority: 15603 + priority: 15663 } } element { scale: 15 area { color: 10400608 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-m" - priority: 16603 + priority: 16663 } caption { primary { @@ -34411,18 +34478,18 @@ cont { stroke_color: 452984831 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 16 area { color: 10400608 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-m" - priority: 16603 + priority: 16663 } caption { primary { @@ -34431,18 +34498,18 @@ cont { stroke_color: 452984831 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 17 area { color: 10400608 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -34451,18 +34518,18 @@ cont { stroke_color: 452984831 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 18 area { color: 10400608 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -34471,18 +34538,18 @@ cont { stroke_color: 452984831 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 19 area { color: 10400608 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -34491,7 +34558,7 @@ cont { stroke_color: 452984831 offset_y: 10 } - priority: 15603 + priority: 15663 } } } @@ -34501,39 +34568,39 @@ cont { scale: 10 area { color: 12372094 - priority: -15919 + priority: -15911 } } element { scale: 11 area { color: 12372094 - priority: -15919 + priority: -15911 } } element { scale: 12 area { color: 12372094 - priority: -15919 + priority: -15911 } } element { scale: 13 area { color: 11781233 - priority: -15919 + priority: -15911 } } element { scale: 14 area { color: 11453035 - priority: -15919 + priority: -15911 } symbol { name: "park-s" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -34550,7 +34617,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -34558,7 +34625,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -34566,11 +34633,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15919 + priority: -15911 } symbol { name: "park-m" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -34587,7 +34654,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -34595,7 +34662,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -34603,11 +34670,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15919 + priority: -15911 } symbol { name: "park-m" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -34624,7 +34691,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -34632,7 +34699,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -34640,11 +34707,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -34661,7 +34728,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -34669,7 +34736,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15955 + priority: -15951 } caption { primary { @@ -34677,7 +34744,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -34685,11 +34752,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -34706,7 +34773,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -34714,11 +34781,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 } caption { primary { @@ -34726,7 +34793,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -34734,11 +34801,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -34755,7 +34822,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -34763,11 +34830,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 } caption { primary { @@ -34775,7 +34842,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -34786,39 +34853,39 @@ cont { scale: 10 area { color: 12372094 - priority: -15919 + priority: -15911 } } element { scale: 11 area { color: 12372094 - priority: -15919 + priority: -15911 } } element { scale: 12 area { color: 12372094 - priority: -15919 + priority: -15911 } } element { scale: 13 area { color: 11781233 - priority: -15919 + priority: -15911 } } element { scale: 14 area { color: 11453035 - priority: -15919 + priority: -15911 } symbol { name: "park-s" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -34835,7 +34902,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -34843,7 +34910,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -34851,11 +34918,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15919 + priority: -15911 } symbol { name: "park-m" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -34872,7 +34939,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -34880,7 +34947,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -34888,11 +34955,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15919 + priority: -15911 } symbol { name: "park-m" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -34909,7 +34976,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -34917,7 +34984,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -34925,11 +34992,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -34946,7 +35013,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -34954,7 +35021,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15955 + priority: -15951 } caption { primary { @@ -34962,7 +35029,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -34970,11 +35037,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -34991,7 +35058,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -34999,11 +35066,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 } caption { primary { @@ -35011,7 +35078,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -35019,11 +35086,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35040,7 +35107,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -35048,11 +35115,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 } caption { primary { @@ -35060,7 +35127,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -35071,39 +35138,39 @@ cont { scale: 10 area { color: 12372094 - priority: -15919 + priority: -15911 } } element { scale: 11 area { color: 12372094 - priority: -15919 + priority: -15911 } } element { scale: 12 area { color: 12372094 - priority: -15919 + priority: -15911 } } element { scale: 13 area { color: 11781233 - priority: -15919 + priority: -15911 } } element { scale: 14 area { color: 11453035 - priority: -15919 + priority: -15911 } symbol { name: "park-s" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -35120,7 +35187,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -35128,7 +35195,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -35136,11 +35203,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15919 + priority: -15911 } symbol { name: "park-m" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -35157,7 +35224,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -35165,7 +35232,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -35173,11 +35240,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15919 + priority: -15911 } symbol { name: "park-m" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -35194,7 +35261,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -35202,7 +35269,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -35210,11 +35277,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35231,7 +35298,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -35239,7 +35306,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15955 + priority: -15951 } caption { primary { @@ -35247,7 +35314,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -35255,11 +35322,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35276,7 +35343,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -35284,11 +35351,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 } caption { primary { @@ -35296,7 +35363,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -35304,11 +35371,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35325,7 +35392,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -35333,11 +35400,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 } caption { primary { @@ -35345,7 +35412,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -35356,39 +35423,39 @@ cont { scale: 10 area { color: 12372094 - priority: -15919 + priority: -15911 } } element { scale: 11 area { color: 12372094 - priority: -15919 + priority: -15911 } } element { scale: 12 area { color: 12372094 - priority: -15919 + priority: -15911 } } element { scale: 13 area { color: 11781233 - priority: -15919 + priority: -15911 } } element { scale: 14 area { color: 11453035 - priority: -15919 + priority: -15911 } symbol { name: "park-s" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -35405,7 +35472,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -35413,7 +35480,7 @@ cont { scale: 14 area { color: 11453035 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -35421,11 +35488,11 @@ cont { scale: 15 area { color: 11584112 - priority: -15919 + priority: -15911 } symbol { name: "park-m" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -35442,7 +35509,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -35450,7 +35517,7 @@ cont { scale: 15 area { color: 11584112 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -35458,11 +35525,11 @@ cont { scale: 16 area { color: 11190117 - priority: -15919 + priority: -15911 } symbol { name: "park-m" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -35479,7 +35546,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -35487,7 +35554,7 @@ cont { scale: 16 area { color: 11190117 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -35495,11 +35562,11 @@ cont { scale: 17 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35516,7 +35583,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -35524,7 +35591,7 @@ cont { scale: 17 area { color: 11190117 - priority: -15955 + priority: -15951 } caption { primary { @@ -35532,7 +35599,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -35540,11 +35607,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35561,7 +35628,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -35569,11 +35636,11 @@ cont { scale: 18 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 } caption { primary { @@ -35581,7 +35648,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -35589,11 +35656,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35610,7 +35677,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -35618,11 +35685,11 @@ cont { scale: 19 area { color: 11190117 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 } caption { primary { @@ -35630,7 +35697,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -35641,26 +35708,26 @@ cont { scale: 15 area { color: 13749671 - priority: -15964 + priority: -15961 } } element { scale: 16 area { color: 13749671 - priority: -15964 + priority: -15961 } } element { scale: 17 area { color: 13749671 - priority: -15955 + priority: -15951 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35676,12 +35743,12 @@ cont { scale: 18 area { color: 13749671 - priority: -15955 + priority: -15951 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35697,12 +35764,12 @@ cont { scale: 19 area { color: 13749671 - priority: -15955 + priority: -15951 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35721,26 +35788,26 @@ cont { scale: 15 area { color: 13749671 - priority: -15460 + priority: -15406 } } element { scale: 16 area { color: 13749671 - priority: -15460 + priority: -15406 } } element { scale: 17 area { color: 13749671 - priority: -15433 + priority: -15377 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -35756,12 +35823,12 @@ cont { scale: 18 area { color: 13749671 - priority: -15433 + priority: -15377 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -35777,12 +35844,12 @@ cont { scale: 19 area { color: 13749671 - priority: -15433 + priority: -15377 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -35801,12 +35868,12 @@ cont { scale: 17 area { color: 13749671 - priority: -15460 + priority: -15406 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -35815,19 +35882,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 area { color: 13749671 - priority: -15460 + priority: -15406 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -35836,19 +35903,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 area { color: 13749671 - priority: -15460 + priority: -15406 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -35857,7 +35924,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -35867,12 +35934,12 @@ cont { scale: 17 area { color: 13749671 - priority: -15433 + priority: -15377 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -35881,19 +35948,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 18 area { color: 13749671 - priority: -15433 + priority: -15377 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -35902,19 +35969,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 area { color: 13749671 - priority: -15433 + priority: -15377 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -35923,7 +35990,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -35934,7 +36001,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -35943,7 +36010,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { @@ -35951,7 +36018,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -35960,7 +36027,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { @@ -35968,7 +36035,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -35977,7 +36044,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -35991,7 +36058,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -36002,7 +36069,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -36013,7 +36080,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -36024,7 +36091,7 @@ cont { symbol { name: "sauna-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -36041,7 +36108,7 @@ cont { symbol { name: "sauna-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -36058,7 +36125,7 @@ cont { symbol { name: "sauna-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -36081,7 +36148,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -36092,7 +36159,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -36103,7 +36170,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -36114,7 +36181,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -36131,7 +36198,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -36148,7 +36215,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -36168,7 +36235,7 @@ cont { symbol { name: "climbing-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -36185,7 +36252,7 @@ cont { symbol { name: "climbing-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -36202,7 +36269,7 @@ cont { symbol { name: "climbing-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -36221,7 +36288,7 @@ cont { scale: 17 symbol { name: "archery-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -36237,7 +36304,7 @@ cont { scale: 18 symbol { name: "archery-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -36253,7 +36320,7 @@ cont { scale: 19 symbol { name: "archery-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -36273,7 +36340,7 @@ cont { symbol { name: "swimming-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -36290,7 +36357,7 @@ cont { symbol { name: "swimming-l" apply_for_type: 1 - priority: 16558 + priority: 16613 min_distance: 10 } caption { @@ -36307,7 +36374,7 @@ cont { symbol { name: "swimming-l" apply_for_type: 1 - priority: 16558 + priority: 16613 min_distance: 10 } caption { @@ -36327,7 +36394,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -36344,7 +36411,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -36361,7 +36428,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -36381,7 +36448,7 @@ cont { symbol { name: "stadium-s" apply_for_type: 1 - priority: 16882 + priority: 16871 min_distance: 16 } caption { @@ -36390,7 +36457,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15882 + priority: 15871 } } element { @@ -36398,7 +36465,7 @@ cont { symbol { name: "stadium-s" apply_for_type: 1 - priority: 16882 + priority: 16871 min_distance: 16 } caption { @@ -36407,19 +36474,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15882 + priority: 15871 } } element { scale: 15 area { color: 13749671 - priority: -15118 + priority: -15129 } symbol { name: "stadium-m" apply_for_type: 1 - priority: 16882 + priority: 16871 min_distance: 8 } caption { @@ -36428,19 +36495,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15882 + priority: 15871 } } element { scale: 16 area { color: 13749671 - priority: -15118 + priority: -15129 } symbol { name: "stadium-m" apply_for_type: 1 - priority: 16882 + priority: 16871 min_distance: 8 } caption { @@ -36449,19 +36516,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15882 + priority: 15871 } } element { scale: 17 area { color: 13749671 - priority: -15118 + priority: -15129 } symbol { name: "stadium-l" apply_for_type: 1 - priority: 16882 + priority: 16871 min_distance: 8 } caption { @@ -36470,19 +36537,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15882 + priority: 15871 } } element { scale: 18 area { color: 13749671 - priority: -15118 + priority: -15129 } symbol { name: "stadium-l" apply_for_type: 1 - priority: 16882 + priority: 16871 min_distance: 8 } caption { @@ -36491,19 +36558,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15882 + priority: 15871 } } element { scale: 19 area { color: 13749671 - priority: -15118 + priority: -15129 } symbol { name: "stadium-l" apply_for_type: 1 - priority: 16882 + priority: 16871 min_distance: 8 } caption { @@ -36512,7 +36579,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15882 + priority: 15871 } } } @@ -36522,39 +36589,39 @@ cont { scale: 13 area { color: 9163744 - priority: -15406 + priority: -15347 } } element { scale: 14 area { color: 9163744 - priority: -15406 + priority: -15347 } } element { scale: 15 area { color: 9163744 - priority: -15406 + priority: -15347 } } element { scale: 16 area { color: 9163744 - priority: -15406 + priority: -15347 } } element { scale: 17 area { color: 9163744 - priority: -15406 + priority: -15347 } symbol { name: "swimming-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -36563,18 +36630,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 area { color: 9163744 - priority: -15406 + priority: -15347 } symbol { name: "swimming-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -36583,18 +36650,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 area { color: 9163744 - priority: -15406 + priority: -15347 } symbol { name: "swimming-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -36603,7 +36670,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -36614,7 +36681,7 @@ cont { lines { width: 1.0 color: 6510384 - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -36624,7 +36691,7 @@ cont { lines { width: 1.5 color: 6510384 - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -36634,7 +36701,7 @@ cont { lines { width: 1.8 color: 6510384 - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -36644,7 +36711,7 @@ cont { color: 3355443 stroke_color: 872415231 } - priority: 15279 + priority: 15306 } } element { @@ -36652,7 +36719,7 @@ cont { lines { width: 3.0 color: 6510384 - priority: 1045 + priority: 1049 join: ROUNDJOIN cap: ROUNDCAP } @@ -36663,7 +36730,7 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -36671,7 +36738,7 @@ cont { lines { width: 3.0 color: 6510384 - priority: 1045 + priority: 1049 join: ROUNDJOIN cap: ROUNDCAP } @@ -36682,7 +36749,7 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -36690,7 +36757,7 @@ cont { lines { width: 4.0 color: 6510384 - priority: 1045 + priority: 1049 join: ROUNDJOIN cap: ROUNDCAP } @@ -36701,7 +36768,7 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -36711,7 +36778,7 @@ cont { scale: 16 symbol { name: "swimming-m" - priority: 16540 + priority: 16594 min_distance: 30 } caption { @@ -36720,14 +36787,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "swimming-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -36736,14 +36803,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "swimming-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -36752,14 +36819,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "swimming-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -36768,7 +36835,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -36778,14 +36845,14 @@ cont { scale: 12 area { color: 14934482 - priority: -15577 + priority: -15535 } } element { scale: 13 area { color: 14934482 - priority: -15577 + priority: -15535 } } element { @@ -36796,7 +36863,7 @@ cont { width: 2.0 color: 14934482 } - priority: -15577 + priority: -15535 } } element { @@ -36807,7 +36874,7 @@ cont { width: 2.0 color: 14934482 } - priority: -15577 + priority: -15535 } } element { @@ -36818,7 +36885,7 @@ cont { width: 2.0 color: 14934482 } - priority: -15577 + priority: -15535 } } element { @@ -36836,7 +36903,7 @@ cont { height: 10 color: 4473924 } - priority: 15423 + priority: 15465 } } element { @@ -36854,7 +36921,7 @@ cont { height: 10 color: 4473924 } - priority: 15423 + priority: 15465 } } element { @@ -36872,7 +36939,7 @@ cont { height: 10 color: 4473924 } - priority: 15423 + priority: 15465 } } } @@ -36882,7 +36949,7 @@ cont { scale: 18 symbol { name: "chimney-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -36890,14 +36957,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "chimney-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -36905,7 +36972,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -36919,7 +36986,7 @@ cont { width: 2.0 color: 14934482 } - priority: -15829 + priority: -15812 } } element { @@ -36930,7 +36997,7 @@ cont { width: 2.0 color: 14934482 } - priority: -15829 + priority: -15812 } } element { @@ -36941,7 +37008,7 @@ cont { width: 2.0 color: 14934482 } - priority: -15829 + priority: -15812 } } element { @@ -36952,7 +37019,7 @@ cont { width: 2.0 color: 14934482 } - priority: -15829 + priority: -15812 } } element { @@ -36963,7 +37030,7 @@ cont { width: 2.0 color: 14934482 } - priority: -15829 + priority: -15812 } } element { @@ -36974,7 +37041,7 @@ cont { width: 2.0 color: 14934482 } - priority: -15829 + priority: -15812 } } } @@ -36984,7 +37051,7 @@ cont { scale: 14 symbol { name: "lighthouse-s" - priority: 16603 + priority: 16663 min_distance: 5 } caption { @@ -36993,14 +37060,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15603 + priority: 15663 } } element { scale: 15 symbol { name: "lighthouse-m" - priority: 16603 + priority: 16663 } caption { primary { @@ -37008,14 +37075,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 16 symbol { name: "lighthouse-m" - priority: 16603 + priority: 16663 } caption { primary { @@ -37023,14 +37090,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 17 symbol { name: "lighthouse-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -37038,14 +37105,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 18 symbol { name: "lighthouse-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -37053,14 +37120,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 19 symbol { name: "lighthouse-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -37068,7 +37135,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15603 + priority: 15663 } } } @@ -37078,14 +37145,14 @@ cont { scale: 12 area { color: 14934482 - priority: -15577 + priority: -15535 } } element { scale: 13 area { color: 14934482 - priority: -15577 + priority: -15535 } } element { @@ -37096,7 +37163,7 @@ cont { width: 2.0 color: 14934482 } - priority: -15577 + priority: -15535 } } element { @@ -37107,7 +37174,7 @@ cont { width: 2.0 color: 14934482 } - priority: -15577 + priority: -15535 } } element { @@ -37118,7 +37185,7 @@ cont { width: 2.0 color: 14934482 } - priority: -15577 + priority: -15535 } } element { @@ -37136,7 +37203,7 @@ cont { height: 10 color: 4473924 } - priority: 15423 + priority: 15465 } } element { @@ -37154,7 +37221,7 @@ cont { height: 10 color: 4473924 } - priority: 15423 + priority: 15465 } } element { @@ -37172,7 +37239,7 @@ cont { height: 10 color: 4473924 } - priority: 15423 + priority: 15465 } } } @@ -37182,7 +37249,7 @@ cont { scale: 16 symbol { name: "windmill-m" - priority: 16540 + priority: 16594 min_distance: 30 } caption { @@ -37191,14 +37258,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "windmill-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -37207,14 +37274,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "windmill-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -37223,14 +37290,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "windmill-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -37239,7 +37306,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -37287,112 +37354,112 @@ cont { scale: 10 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 11 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 12 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 13 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 14 area { color: 9163744 - priority: -15856 + priority: -15842 } caption { primary { height: 10 color: 4495803 } - priority: 15144 + priority: 15158 } } element { scale: 15 area { color: 9163744 - priority: -15856 + priority: -15842 } caption { primary { height: 10 color: 4495803 } - priority: 15144 + priority: 15158 } } element { scale: 16 area { color: 9163744 - priority: -15856 + priority: -15842 } caption { primary { height: 11 color: 4495803 } - priority: 15144 + priority: 15158 } } element { scale: 17 area { color: 9163744 - priority: -15856 + priority: -15842 } caption { primary { height: 11 color: 4495803 } - priority: 15144 + priority: 15158 } } element { scale: 18 area { color: 9163744 - priority: -15856 + priority: -15842 } caption { primary { height: 11 color: 4495803 } - priority: 15144 + priority: 15158 } } element { scale: 19 area { color: 9163744 - priority: -15856 + priority: -15842 } caption { primary { height: 11 color: 4495803 } - priority: 15144 + priority: 15158 } } } @@ -37402,60 +37469,60 @@ cont { scale: 10 area { color: 16575614 - priority: -15460 + priority: -15406 } } element { scale: 11 area { color: 16575614 - priority: -15460 + priority: -15406 } } element { scale: 12 area { color: 16575614 - priority: -15460 + priority: -15406 } } element { scale: 13 area { color: 16575614 - priority: -15460 + priority: -15406 } } element { scale: 14 area { color: 16575614 - priority: -15460 + priority: -15406 } } element { scale: 15 area { color: 16575614 - priority: -15460 + priority: -15406 } caption { primary { height: 10 color: 4473924 } - priority: 15540 + priority: 15594 } } element { scale: 16 area { color: 16575614 - priority: -15460 + priority: -15406 } symbol { name: "beach-m" - priority: 16540 + priority: 16594 } caption { primary { @@ -37463,18 +37530,18 @@ cont { color: 4473924 offset_y: 5 } - priority: 15540 + priority: 15594 } } element { scale: 17 area { color: 16575614 - priority: -15460 + priority: -15406 } symbol { name: "beach-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -37482,18 +37549,18 @@ cont { color: 4473924 offset_y: 5 } - priority: 15540 + priority: 15594 } } element { scale: 18 area { color: 16575614 - priority: -15460 + priority: -15406 } symbol { name: "beach-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -37501,18 +37568,18 @@ cont { color: 4473924 offset_y: 5 } - priority: 15540 + priority: 15594 } } element { scale: 19 area { color: 16575614 - priority: -15460 + priority: -15406 } symbol { name: "beach-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -37520,7 +37587,7 @@ cont { color: 4473924 offset_y: 5 } - priority: 15540 + priority: 15594 } } } @@ -37593,7 +37660,7 @@ cont { scale: 11 symbol { name: "cave-s" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -37602,14 +37669,14 @@ cont { color: 4473924 offset_y: 5 } - priority: 15531 + priority: 15584 } } element { scale: 12 symbol { name: "cave-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -37617,14 +37684,14 @@ cont { color: 4473924 offset_y: 8 } - priority: 15531 + priority: 15584 } } element { scale: 13 symbol { name: "cave-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -37632,14 +37699,14 @@ cont { color: 4473924 offset_y: 8 } - priority: 15531 + priority: 15584 } } element { scale: 14 symbol { name: "cave-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -37647,14 +37714,14 @@ cont { color: 4473924 offset_y: 8 } - priority: 15531 + priority: 15584 } } element { scale: 15 symbol { name: "cave-m" - priority: 16531 + priority: 16584 } caption { primary { @@ -37662,14 +37729,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 16 symbol { name: "cave-m" - priority: 16531 + priority: 16584 } caption { primary { @@ -37677,14 +37744,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 17 symbol { name: "cave-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -37692,14 +37759,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "cave-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -37707,14 +37774,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "cave-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -37722,7 +37789,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -38018,56 +38085,56 @@ cont { scale: 12 area { color: 13620648 - priority: -15874 + priority: -15862 } } element { scale: 13 area { color: 13620648 - priority: -15874 + priority: -15862 } } element { scale: 14 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 15 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 16 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 17 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 18 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 19 area { color: 13029267 - priority: -15874 + priority: -15862 } } } @@ -38077,56 +38144,56 @@ cont { scale: 12 area { color: 13620648 - priority: -15874 + priority: -15862 } } element { scale: 13 area { color: 13620648 - priority: -15874 + priority: -15862 } } element { scale: 14 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 15 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 16 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 17 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 18 area { color: 13029267 - priority: -15874 + priority: -15862 } } element { scale: 19 area { color: 13029267 - priority: -15874 + priority: -15862 } } } @@ -38136,84 +38203,84 @@ cont { scale: 0 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 1 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 2 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 3 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 4 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 5 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 6 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 7 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 8 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 9 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 10 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38221,7 +38288,7 @@ cont { scale: 10 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38229,14 +38296,14 @@ cont { scale: 11 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38244,7 +38311,7 @@ cont { scale: 11 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38252,14 +38319,14 @@ cont { scale: 12 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38267,7 +38334,7 @@ cont { scale: 12 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38275,14 +38342,14 @@ cont { scale: 13 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38290,7 +38357,7 @@ cont { scale: 13 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38298,14 +38365,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38313,7 +38380,7 @@ cont { scale: 14 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38321,14 +38388,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38336,7 +38403,7 @@ cont { scale: 15 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38344,14 +38411,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38359,7 +38426,7 @@ cont { scale: 16 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38367,14 +38434,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38382,7 +38449,7 @@ cont { scale: 17 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38390,14 +38457,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38405,7 +38472,7 @@ cont { scale: 18 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38413,14 +38480,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38428,7 +38495,7 @@ cont { scale: 19 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38582,7 +38649,7 @@ cont { scale: 12 symbol { name: "peakt-s" - priority: 16531 + priority: 16584 min_distance: 10 } caption { @@ -38591,7 +38658,7 @@ cont { color: 4473924 offset_y: 5 } - priority: 15531 + priority: 15584 } apply_if: "name" } @@ -38603,7 +38670,7 @@ cont { color: 4473924 offset_y: 5 } - priority: 15531 + priority: 15584 } apply_if: "!name" } @@ -38611,7 +38678,7 @@ cont { scale: 13 symbol { name: "peakt-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -38619,7 +38686,7 @@ cont { color: 4473924 offset_y: 5 } - priority: 15531 + priority: 15584 } apply_if: "name" } @@ -38631,7 +38698,7 @@ cont { color: 4473924 offset_y: 5 } - priority: 15531 + priority: 15584 } apply_if: "!name" } @@ -38639,7 +38706,7 @@ cont { scale: 14 symbol { name: "peakt-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -38647,7 +38714,7 @@ cont { color: 4473924 offset_y: 5 } - priority: 15531 + priority: 15584 } apply_if: "name" } @@ -38655,7 +38722,7 @@ cont { scale: 15 symbol { name: "peakt-m" - priority: 16531 + priority: 16584 } caption { primary { @@ -38663,14 +38730,14 @@ cont { color: 4473924 offset_y: 5 } - priority: 15531 + priority: 15584 } } element { scale: 16 symbol { name: "peakt-m" - priority: 16531 + priority: 16584 } caption { primary { @@ -38678,14 +38745,14 @@ cont { color: 4473924 offset_y: 5 } - priority: 15531 + priority: 15584 } } element { scale: 17 symbol { name: "peakt-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -38693,14 +38760,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "peakt-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -38708,14 +38775,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "peakt-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -38723,7 +38790,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15531 + priority: 15584 } } } @@ -38733,140 +38800,140 @@ cont { scale: 0 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 1 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 2 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 3 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 4 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 5 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 6 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 7 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 8 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 9 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 10 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 11 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 12 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 13 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 14 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 15 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 16 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 17 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 18 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 19 area { color: 9163744 - priority: -15856 + priority: -15842 } } } @@ -38914,140 +38981,140 @@ cont { scale: 0 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 1 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 2 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 3 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 4 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 5 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 6 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 7 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 8 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 9 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 10 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 11 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 12 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 13 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 14 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 15 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 16 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 17 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 18 area { color: 9163744 - priority: -15856 + priority: -15842 } } element { scale: 19 area { color: 9163744 - priority: -15856 + priority: -15842 } } } @@ -39057,56 +39124,56 @@ cont { scale: 12 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 13 area { color: 13620648 - priority: -15910 + priority: -15901 } } element { scale: 14 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 15 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 16 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 17 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 18 area { color: 13029267 - priority: -15910 + priority: -15901 } } element { scale: 19 area { color: 13029267 - priority: -15910 + priority: -15901 } } } @@ -39116,7 +39183,7 @@ cont { scale: 14 symbol { name: "drinking-water-s" - priority: 16522 + priority: 16574 min_distance: 24 } caption { @@ -39125,14 +39192,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15522 + priority: 15574 } } element { scale: 15 symbol { name: "drinking-water-m" - priority: 16522 + priority: 16574 min_distance: 24 } caption { @@ -39141,14 +39208,14 @@ cont { color: 4473924 offset_y: 8 } - priority: 15522 + priority: 15574 } } element { scale: 16 symbol { name: "drinking-water-m" - priority: 16522 + priority: 16574 min_distance: 24 } caption { @@ -39157,14 +39224,14 @@ cont { color: 4473924 offset_y: 8 } - priority: 15522 + priority: 15574 } } element { scale: 17 symbol { name: "drinking-water-l" - priority: 16522 + priority: 16574 min_distance: 24 } caption { @@ -39173,14 +39240,14 @@ cont { color: 4473924 offset_y: 8 } - priority: 15522 + priority: 15574 } } element { scale: 18 symbol { name: "drinking-water-l" - priority: 16522 + priority: 16574 min_distance: 24 } caption { @@ -39189,14 +39256,14 @@ cont { color: 4473924 offset_y: 8 } - priority: 15522 + priority: 15574 } } element { scale: 19 symbol { name: "drinking-water-l" - priority: 16522 + priority: 16574 min_distance: 24 } caption { @@ -39205,7 +39272,7 @@ cont { color: 4473924 offset_y: 8 } - priority: 15522 + priority: 15574 } } } @@ -39215,7 +39282,7 @@ cont { scale: 10 symbol { name: "volcano-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -39223,14 +39290,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 11 symbol { name: "volcano-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -39238,14 +39305,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 12 symbol { name: "volcano-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -39253,14 +39320,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 13 symbol { name: "volcano-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -39268,14 +39335,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 14 symbol { name: "volcano-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -39283,14 +39350,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 15 symbol { name: "volcano-m" - priority: 16531 + priority: 16584 } caption { primary { @@ -39298,14 +39365,14 @@ cont { color: 4473924 offset_y: 8 } - priority: 15531 + priority: 15584 } } element { scale: 16 symbol { name: "volcano-m" - priority: 16531 + priority: 16584 } caption { primary { @@ -39313,14 +39380,14 @@ cont { color: 4473924 offset_y: 8 } - priority: 15531 + priority: 15584 } } element { scale: 17 symbol { name: "volcano-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -39328,14 +39395,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "volcano-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -39343,14 +39410,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "volcano-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -39358,7 +39425,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -39368,84 +39435,84 @@ cont { scale: 0 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 1 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 2 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 3 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 4 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 5 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 6 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 7 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 8 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 9 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 10 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39453,7 +39520,7 @@ cont { scale: 10 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -39461,14 +39528,14 @@ cont { scale: 11 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39476,7 +39543,7 @@ cont { scale: 11 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -39484,14 +39551,14 @@ cont { scale: 12 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39499,7 +39566,7 @@ cont { scale: 12 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -39507,14 +39574,14 @@ cont { scale: 13 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39522,7 +39589,7 @@ cont { scale: 13 area { color: 9163744 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -39530,14 +39597,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 10 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39545,14 +39612,14 @@ cont { scale: 14 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 10 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area<4000000" } @@ -39560,14 +39627,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 10 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39575,14 +39642,14 @@ cont { scale: 15 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 10 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area<4000000" } @@ -39590,14 +39657,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 11 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39605,14 +39672,14 @@ cont { scale: 16 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 11 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area<4000000" } @@ -39620,14 +39687,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 11 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39635,14 +39702,14 @@ cont { scale: 17 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 11 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area<4000000" } @@ -39650,14 +39717,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 11 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39665,14 +39732,14 @@ cont { scale: 18 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 11 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area<4000000" } @@ -39680,14 +39747,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 11 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39695,14 +39762,14 @@ cont { scale: 19 area { color: 9163744 - priority: -15028 + priority: -15030 } caption { primary { height: 11 color: 4495803 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area<4000000" } @@ -39713,91 +39780,91 @@ cont { scale: 11 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 12 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 13 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 14 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 15 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 16 area { color: 13229526 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 4495803 } - priority: 15099 + priority: 15108 } } element { scale: 17 area { color: 13229526 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 4495803 } - priority: 15099 + priority: 15108 } } element { scale: 18 area { color: 13229526 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 4495803 } - priority: 15099 + priority: 15108 } } element { scale: 19 area { color: 13229526 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 4495803 } - priority: 15099 + priority: 15108 } } } @@ -39807,91 +39874,91 @@ cont { scale: 11 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 12 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 13 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 14 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 15 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 16 area { color: 13229526 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 4495803 } - priority: 15099 + priority: 15108 } } element { scale: 17 area { color: 13229526 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 4495803 } - priority: 15099 + priority: 15108 } } element { scale: 18 area { color: 13229526 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 4495803 } - priority: 15099 + priority: 15108 } } element { scale: 19 area { color: 13229526 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 4495803 } - priority: 15099 + priority: 15108 } } } @@ -39901,91 +39968,91 @@ cont { scale: 11 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 12 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 13 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 14 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 15 area { color: 13229526 - priority: -15901 + priority: -15892 } } element { scale: 16 area { color: 13229526 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 4495803 } - priority: 15099 + priority: 15108 } } element { scale: 17 area { color: 13229526 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 4495803 } - priority: 15099 + priority: 15108 } } element { scale: 18 area { color: 13229526 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 4495803 } - priority: 15099 + priority: 15108 } } element { scale: 19 area { color: 13229526 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 4495803 } - priority: 15099 + priority: 15108 } } } @@ -39995,70 +40062,70 @@ cont { scale: 10 area { color: 13029267 - priority: -15928 + priority: -15921 } } element { scale: 11 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 12 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 13 area { color: 11781233 - priority: -15928 + priority: -15921 } } element { scale: 14 area { color: 11453035 - priority: -15928 + priority: -15921 } } element { scale: 15 area { color: 11584112 - priority: -15928 + priority: -15921 } } element { scale: 16 area { color: 11190117 - priority: -15928 + priority: -15921 } } element { scale: 17 area { color: 11190117 - priority: -15928 + priority: -15921 } } element { scale: 18 area { color: 11190117 - priority: -15928 + priority: -15921 } } element { scale: 19 area { color: 11190117 - priority: -15928 + priority: -15921 } } } @@ -40068,70 +40135,70 @@ cont { scale: 10 area { color: 13029267 - priority: -15928 + priority: -15921 } } element { scale: 11 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 12 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 13 area { color: 11781233 - priority: -15928 + priority: -15921 } } element { scale: 14 area { color: 11453035 - priority: -15928 + priority: -15921 } } element { scale: 15 area { color: 11584112 - priority: -15928 + priority: -15921 } } element { scale: 16 area { color: 11190117 - priority: -15928 + priority: -15921 } } element { scale: 17 area { color: 11190117 - priority: -15928 + priority: -15921 } } element { scale: 18 area { color: 11190117 - priority: -15928 + priority: -15921 } } element { scale: 19 area { color: 11190117 - priority: -15928 + priority: -15921 } } } @@ -40141,70 +40208,70 @@ cont { scale: 10 area { color: 13029267 - priority: -15928 + priority: -15921 } } element { scale: 11 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 12 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 13 area { color: 11781233 - priority: -15928 + priority: -15921 } } element { scale: 14 area { color: 11453035 - priority: -15928 + priority: -15921 } } element { scale: 15 area { color: 11584112 - priority: -15928 + priority: -15921 } } element { scale: 16 area { color: 11190117 - priority: -15928 + priority: -15921 } } element { scale: 17 area { color: 11190117 - priority: -15928 + priority: -15921 } } element { scale: 18 area { color: 11190117 - priority: -15928 + priority: -15921 } } element { scale: 19 area { color: 11190117 - priority: -15928 + priority: -15921 } } } @@ -40214,70 +40281,70 @@ cont { scale: 10 area { color: 13029267 - priority: -15928 + priority: -15921 } } element { scale: 11 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 12 area { color: 12372094 - priority: -15928 + priority: -15921 } } element { scale: 13 area { color: 11781233 - priority: -15928 + priority: -15921 } } element { scale: 14 area { color: 11453035 - priority: -15928 + priority: -15921 } } element { scale: 15 area { color: 11584112 - priority: -15928 + priority: -15921 } } element { scale: 16 area { color: 11190117 - priority: -15928 + priority: -15921 } } element { scale: 17 area { color: 11190117 - priority: -15928 + priority: -15921 } } element { scale: 18 area { color: 11190117 - priority: -15928 + priority: -15921 } } element { scale: 19 area { color: 11190117 - priority: -15928 + priority: -15921 } } } @@ -40287,7 +40354,7 @@ cont { scale: 18 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40295,14 +40362,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40310,7 +40377,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -40320,7 +40387,7 @@ cont { scale: 18 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40328,14 +40395,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40343,7 +40410,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -40353,7 +40420,7 @@ cont { scale: 18 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40361,14 +40428,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40376,7 +40443,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -40386,7 +40453,7 @@ cont { scale: 18 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40394,14 +40461,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40409,7 +40476,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -40419,7 +40486,7 @@ cont { scale: 17 symbol { name: "lawyer-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -40428,14 +40495,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "lawyer-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -40444,14 +40511,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "lawyer-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -40460,7 +40527,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -40470,7 +40537,7 @@ cont { scale: 18 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40478,14 +40545,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40493,7 +40560,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -40504,7 +40571,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: BEVELJOIN cap: BUTTCAP } @@ -40514,7 +40581,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40524,7 +40591,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40534,7 +40601,7 @@ cont { lines { width: 1.6 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40544,7 +40611,7 @@ cont { lines { width: 1.6 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40554,7 +40621,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40564,7 +40631,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40574,7 +40641,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40587,7 +40654,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: BEVELJOIN cap: BUTTCAP } @@ -40597,7 +40664,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40607,7 +40674,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40617,7 +40684,7 @@ cont { lines { width: 1.6 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40627,7 +40694,7 @@ cont { lines { width: 1.6 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40637,7 +40704,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40647,7 +40714,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40657,7 +40724,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40670,7 +40737,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: BEVELJOIN cap: BUTTCAP } @@ -40680,7 +40747,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40690,7 +40757,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40700,7 +40767,7 @@ cont { lines { width: 1.6 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40710,7 +40777,7 @@ cont { lines { width: 1.6 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40720,7 +40787,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40730,7 +40797,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40740,7 +40807,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40753,7 +40820,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: BEVELJOIN cap: BUTTCAP } @@ -40763,7 +40830,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40773,7 +40840,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40783,7 +40850,7 @@ cont { lines { width: 1.6 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40793,7 +40860,7 @@ cont { lines { width: 1.6 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40803,7 +40870,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40813,7 +40880,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40823,7 +40890,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40836,7 +40903,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: BEVELJOIN cap: BUTTCAP } @@ -40846,7 +40913,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40856,7 +40923,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40866,7 +40933,7 @@ cont { lines { width: 1.6 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40876,7 +40943,7 @@ cont { lines { width: 1.6 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40886,7 +40953,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40896,7 +40963,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40906,7 +40973,7 @@ cont { lines { width: 2.0 color: 4473924 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40919,7 +40986,7 @@ cont { lines { width: 0.8 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -40929,7 +40996,7 @@ cont { lines { width: 1.1 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -40939,7 +41006,7 @@ cont { lines { width: 1.1 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -40949,7 +41016,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -40959,7 +41026,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -40969,7 +41036,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -40982,7 +41049,7 @@ cont { lines { width: 1.0 color: 657933 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -40992,7 +41059,7 @@ cont { lines { width: 1.1 color: 657933 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41002,7 +41069,7 @@ cont { lines { width: 1.1 color: 657933 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41012,7 +41079,7 @@ cont { lines { width: 1.5 color: 657933 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41022,7 +41089,7 @@ cont { lines { width: 1.5 color: 657933 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41032,7 +41099,7 @@ cont { lines { width: 1.5 color: 657933 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41045,7 +41112,7 @@ cont { lines { width: 1.0 color: 731131 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41055,7 +41122,7 @@ cont { lines { width: 1.1 color: 731131 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41065,7 +41132,7 @@ cont { lines { width: 1.1 color: 731131 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41075,7 +41142,7 @@ cont { lines { width: 1.5 color: 731131 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41085,7 +41152,7 @@ cont { lines { width: 1.5 color: 731131 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41095,7 +41162,7 @@ cont { lines { width: 1.5 color: 731131 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41108,7 +41175,7 @@ cont { lines { width: 1.0 color: 2229797 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41118,7 +41185,7 @@ cont { lines { width: 1.1 color: 2229797 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41128,7 +41195,7 @@ cont { lines { width: 1.1 color: 2229797 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41138,7 +41205,7 @@ cont { lines { width: 1.5 color: 2229797 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41148,7 +41215,7 @@ cont { lines { width: 1.5 color: 2229797 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41158,7 +41225,7 @@ cont { lines { width: 1.5 color: 2229797 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41171,7 +41238,7 @@ cont { lines { width: 1.0 color: 2229797 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41181,7 +41248,7 @@ cont { lines { width: 1.1 color: 2229797 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41191,7 +41258,7 @@ cont { lines { width: 1.1 color: 2229797 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41201,7 +41268,7 @@ cont { lines { width: 1.5 color: 2229797 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41211,7 +41278,7 @@ cont { lines { width: 1.5 color: 2229797 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41221,7 +41288,7 @@ cont { lines { width: 1.5 color: 2229797 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41234,7 +41301,7 @@ cont { lines { width: 1.0 color: 16518683 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41244,7 +41311,7 @@ cont { lines { width: 1.1 color: 16518683 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41254,7 +41321,7 @@ cont { lines { width: 1.1 color: 16518683 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41264,7 +41331,7 @@ cont { lines { width: 1.5 color: 16518683 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41274,7 +41341,7 @@ cont { lines { width: 1.5 color: 16518683 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41284,7 +41351,7 @@ cont { lines { width: 1.5 color: 16518683 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41297,7 +41364,7 @@ cont { lines { width: 1.0 color: 6286126 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41307,7 +41374,7 @@ cont { lines { width: 1.1 color: 6286126 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41317,7 +41384,7 @@ cont { lines { width: 1.1 color: 6286126 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41327,7 +41394,7 @@ cont { lines { width: 1.5 color: 6286126 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41337,7 +41404,7 @@ cont { lines { width: 1.5 color: 6286126 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41347,7 +41414,7 @@ cont { lines { width: 1.5 color: 6286126 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41360,7 +41427,7 @@ cont { lines { width: 0.8 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41370,7 +41437,7 @@ cont { lines { width: 1.1 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41380,7 +41447,7 @@ cont { lines { width: 1.1 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41390,7 +41457,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41400,7 +41467,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41410,7 +41477,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41423,7 +41490,7 @@ cont { lines { width: 0.8 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41433,7 +41500,7 @@ cont { lines { width: 1.1 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41443,7 +41510,7 @@ cont { lines { width: 1.1 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41453,7 +41520,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41463,7 +41530,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41473,7 +41540,7 @@ cont { lines { width: 1.5 color: 12876543 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41496,7 +41563,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=1000000" } @@ -41515,7 +41582,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=150000" } @@ -41534,7 +41601,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=50000" } @@ -41553,7 +41620,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41572,7 +41639,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41591,7 +41658,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41610,7 +41677,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41629,7 +41696,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41648,7 +41715,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41667,7 +41734,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41686,7 +41753,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41705,7 +41772,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41724,7 +41791,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41743,7 +41810,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41762,7 +41829,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41781,7 +41848,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41803,7 +41870,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=1000000" } @@ -41822,7 +41889,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=150000" } @@ -41841,7 +41908,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=50000" } @@ -41860,7 +41927,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41879,7 +41946,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41898,7 +41965,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41917,7 +41984,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41936,7 +42003,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41955,7 +42022,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41974,7 +42041,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41993,7 +42060,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42012,7 +42079,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42031,7 +42098,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42050,7 +42117,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42069,7 +42136,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42088,7 +42155,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42110,7 +42177,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=1000000" } @@ -42129,7 +42196,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=150000" } @@ -42148,7 +42215,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=50000" } @@ -42167,7 +42234,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42186,7 +42253,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42205,7 +42272,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42224,7 +42291,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42243,7 +42310,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42262,7 +42329,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42281,7 +42348,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42300,7 +42367,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42319,7 +42386,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42338,7 +42405,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42357,7 +42424,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42376,7 +42443,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42395,7 +42462,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42417,7 +42484,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=1000000" } @@ -42436,7 +42503,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=150000" } @@ -42455,7 +42522,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=50000" } @@ -42474,7 +42541,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42493,7 +42560,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42512,7 +42579,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42531,7 +42598,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42550,7 +42617,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42569,7 +42636,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42588,7 +42655,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42607,7 +42674,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42626,7 +42693,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42645,7 +42712,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42664,7 +42731,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42683,7 +42750,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42702,7 +42769,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42714,7 +42781,7 @@ cont { symbol { name: "star-s" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -42730,7 +42797,7 @@ cont { offset_y: 9 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -42738,7 +42805,7 @@ cont { symbol { name: "star-m" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -42754,7 +42821,7 @@ cont { offset_y: 9 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -42762,7 +42829,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -42778,7 +42845,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -42786,7 +42853,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -42802,7 +42869,7 @@ cont { offset_y: 11 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -42810,7 +42877,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -42826,7 +42893,7 @@ cont { offset_y: 11 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -42834,7 +42901,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -42850,7 +42917,7 @@ cont { offset_y: 11 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -42858,7 +42925,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -42874,7 +42941,7 @@ cont { offset_y: 9 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -42882,7 +42949,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -42898,7 +42965,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -42906,7 +42973,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -42922,7 +42989,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -42930,7 +42997,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -42946,7 +43013,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -42954,7 +43021,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -42970,7 +43037,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -42978,7 +43045,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -42994,7 +43061,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -43002,7 +43069,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -43018,7 +43085,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -43026,7 +43093,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -43042,7 +43109,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -43050,7 +43117,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -43066,7 +43133,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -43074,7 +43141,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -43090,7 +43157,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } } @@ -43111,7 +43178,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15486 + priority: 15534 } apply_if: "population>=1000000" } @@ -43130,7 +43197,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15486 + priority: 15534 } apply_if: "population>=150000" } @@ -43149,7 +43216,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15486 + priority: 15534 } apply_if: "population>=50000" } @@ -43168,7 +43235,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43187,7 +43254,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43206,7 +43273,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43225,7 +43292,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43244,7 +43311,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43263,7 +43330,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43282,7 +43349,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43301,7 +43368,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43320,7 +43387,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43339,7 +43406,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43358,7 +43425,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43377,7 +43444,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43396,7 +43463,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43418,7 +43485,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15486 + priority: 15534 } apply_if: "population>=1000000" } @@ -43437,7 +43504,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15486 + priority: 15534 } apply_if: "population>=150000" } @@ -43456,7 +43523,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15486 + priority: 15534 } apply_if: "population>=50000" } @@ -43475,7 +43542,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43494,7 +43561,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43513,7 +43580,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43532,7 +43599,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43551,7 +43618,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43570,7 +43637,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43589,7 +43656,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43608,7 +43675,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43627,7 +43694,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43646,7 +43713,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43665,7 +43732,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43684,7 +43751,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43703,7 +43770,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43725,7 +43792,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=1000000" } @@ -43744,7 +43811,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=150000" } @@ -43763,7 +43830,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=50000" } @@ -43782,7 +43849,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43801,7 +43868,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43820,7 +43887,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43839,7 +43906,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43858,7 +43925,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43877,7 +43944,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43896,7 +43963,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43915,7 +43982,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43934,7 +44001,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43953,7 +44020,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43972,7 +44039,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43991,7 +44058,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44010,7 +44077,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44032,7 +44099,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=1000000" } @@ -44051,7 +44118,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=150000" } @@ -44070,7 +44137,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=50000" } @@ -44089,7 +44156,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44108,7 +44175,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44127,7 +44194,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44146,7 +44213,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44165,7 +44232,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44184,7 +44251,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44203,7 +44270,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44222,7 +44289,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44241,7 +44308,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44260,7 +44327,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44279,7 +44346,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44298,7 +44365,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44317,7 +44384,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44339,7 +44406,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=1000000" } @@ -44358,7 +44425,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=150000" } @@ -44377,7 +44444,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=50000" } @@ -44396,7 +44463,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44415,7 +44482,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44434,7 +44501,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44453,7 +44520,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44472,7 +44539,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44491,7 +44558,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44510,7 +44577,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44529,7 +44596,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44548,7 +44615,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44567,7 +44634,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44586,7 +44653,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44605,7 +44672,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44624,7 +44691,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44646,7 +44713,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=1000000" } @@ -44665,7 +44732,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=150000" } @@ -44684,7 +44751,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=50000" } @@ -44703,7 +44770,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44722,7 +44789,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44741,7 +44808,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44760,7 +44827,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44779,7 +44846,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44798,7 +44865,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44817,7 +44884,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44836,7 +44903,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44855,7 +44922,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44874,7 +44941,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44893,7 +44960,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44912,7 +44979,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44931,7 +44998,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44953,7 +45020,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=1000000" } @@ -44972,7 +45039,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=150000" } @@ -44991,7 +45058,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=50000" } @@ -45010,7 +45077,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45029,7 +45096,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45048,7 +45115,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45067,7 +45134,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45086,7 +45153,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45105,7 +45172,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45124,7 +45191,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45143,7 +45210,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45162,7 +45229,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45181,7 +45248,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45200,7 +45267,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45219,7 +45286,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45238,7 +45305,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45650,7 +45717,7 @@ cont { color: 4473924 stroke_color: 1728053247 } - priority: 15441 + priority: 15485 } } element { @@ -45661,7 +45728,7 @@ cont { color: 4473924 stroke_color: 1728053247 } - priority: 15441 + priority: 15485 } } element { @@ -45672,7 +45739,7 @@ cont { color: 4473924 stroke_color: 1728053247 } - priority: 15441 + priority: 15485 } } element { @@ -45683,7 +45750,7 @@ cont { color: 4473924 stroke_color: 1728053247 } - priority: 15441 + priority: 15485 } } element { @@ -45694,7 +45761,7 @@ cont { color: 4473924 stroke_color: 1728053247 } - priority: 15441 + priority: 15485 } } element { @@ -45705,7 +45772,7 @@ cont { color: 4473924 stroke_color: 1728053247 } - priority: 15441 + priority: 15485 } } element { @@ -45716,7 +45783,7 @@ cont { color: 4473924 stroke_color: 1728053247 } - priority: 15441 + priority: 15485 } } } @@ -46234,7 +46301,7 @@ cont { height: 14 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46244,7 +46311,7 @@ cont { height: 14 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46254,7 +46321,7 @@ cont { height: 15 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46264,7 +46331,7 @@ cont { height: 16 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46274,7 +46341,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46284,7 +46351,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46294,7 +46361,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46304,7 +46371,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46314,7 +46381,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46324,7 +46391,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46334,7 +46401,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46344,7 +46411,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46354,7 +46421,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46364,7 +46431,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46374,7 +46441,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46384,7 +46451,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46394,7 +46461,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46404,7 +46471,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46414,7 +46481,7 @@ cont { height: 18 color: 4495803 } - priority: 15945 + priority: 15940 } } } @@ -46450,7 +46517,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46460,7 +46527,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46470,7 +46537,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46480,7 +46547,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46490,7 +46557,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46500,7 +46567,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46510,7 +46577,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46520,7 +46587,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46530,7 +46597,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46540,7 +46607,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46550,7 +46617,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46560,7 +46627,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46570,7 +46637,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46580,7 +46647,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46590,7 +46657,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } element { @@ -46600,7 +46667,7 @@ cont { height: 12 color: 4495803 } - priority: 15945 + priority: 15940 } } } @@ -46613,7 +46680,7 @@ cont { height: 11 color: 9211020 } - priority: 15432 + priority: 15475 } } element { @@ -46629,7 +46696,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15432 + priority: 15475 } } element { @@ -46645,7 +46712,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15432 + priority: 15475 } } element { @@ -46661,7 +46728,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15432 + priority: 15475 } } element { @@ -46677,7 +46744,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15432 + priority: 15475 } } } @@ -46690,7 +46757,7 @@ cont { height: 11 color: 9211020 } - priority: 15432 + priority: 15475 } } element { @@ -46700,7 +46767,7 @@ cont { height: 11 color: 9211020 } - priority: 15432 + priority: 15475 } } element { @@ -46716,7 +46783,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15432 + priority: 15475 } } element { @@ -46732,7 +46799,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15432 + priority: 15475 } } element { @@ -46748,7 +46815,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15432 + priority: 15475 } } element { @@ -46764,7 +46831,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15432 + priority: 15475 } } } @@ -46848,7 +46915,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } apply_if: "population>=40000" } @@ -46865,7 +46932,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } apply_if: "population>=20000" } @@ -46884,7 +46951,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } element { @@ -46902,7 +46969,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } element { @@ -46920,7 +46987,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } element { @@ -46938,7 +47005,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } element { @@ -46956,7 +47023,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } element { @@ -46974,7 +47041,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } element { @@ -46992,7 +47059,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } element { @@ -47010,7 +47077,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } element { @@ -47028,7 +47095,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } element { @@ -47046,7 +47113,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } } @@ -47067,7 +47134,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15459 + priority: 15504 } } element { @@ -47085,7 +47152,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15459 + priority: 15504 } } element { @@ -47103,7 +47170,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15459 + priority: 15504 } } element { @@ -47121,7 +47188,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15459 + priority: 15504 } } element { @@ -47139,7 +47206,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15459 + priority: 15504 } } element { @@ -47157,7 +47224,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15459 + priority: 15504 } } element { @@ -47175,7 +47242,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15459 + priority: 15504 } } element { @@ -47193,7 +47260,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15459 + priority: 15504 } } element { @@ -47211,7 +47278,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15459 + priority: 15504 } } } @@ -47222,7 +47289,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1513 + priority: 1564 join: ROUNDJOIN cap: ROUNDCAP } @@ -47235,7 +47302,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1513 + priority: 1564 join: ROUNDJOIN cap: ROUNDCAP } @@ -47247,7 +47314,7 @@ cont { scale: 17 symbol { name: "power-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -47256,14 +47323,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "power-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -47272,14 +47339,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "power-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -47288,7 +47355,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -47298,7 +47365,7 @@ cont { scale: 17 symbol { name: "power-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -47307,14 +47374,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "power-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -47323,14 +47390,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "power-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -47339,7 +47406,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -47412,28 +47479,28 @@ cont { scale: 16 area { color: 15591638 - priority: -15883 + priority: -15872 } } element { scale: 17 area { color: 15591638 - priority: -15883 + priority: -15872 } } element { scale: 18 area { color: 15591638 - priority: -15883 + priority: -15872 } } element { scale: 19 area { color: 15591638 - priority: -15883 + priority: -15872 } } } @@ -47448,7 +47515,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47462,7 +47529,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47476,7 +47543,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47490,7 +47557,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47507,7 +47574,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47528,7 +47595,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47549,7 +47616,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47570,7 +47637,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47594,7 +47661,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47608,7 +47675,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47622,7 +47689,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47636,7 +47703,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47653,7 +47720,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47667,7 +47734,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47681,7 +47748,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47695,7 +47762,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47712,7 +47779,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47726,7 +47793,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47740,7 +47807,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47754,7 +47821,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -48016,7 +48083,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 min_distance: 10 } } @@ -48025,7 +48092,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -48041,7 +48108,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -48049,7 +48116,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -48065,7 +48132,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -48073,7 +48140,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -48089,7 +48156,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -48097,7 +48164,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -48113,7 +48180,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -48121,7 +48188,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -48137,7 +48204,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -48145,7 +48212,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -48161,7 +48228,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -48169,7 +48236,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -48185,7 +48252,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -48193,7 +48260,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -48209,7 +48276,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -48220,7 +48287,7 @@ cont { symbol { name: "railway-crossing" apply_for_type: 1 - priority: 16594 + priority: 16653 } } element { @@ -48228,7 +48295,7 @@ cont { symbol { name: "railway-crossing" apply_for_type: 1 - priority: 16594 + priority: 16653 } } element { @@ -48236,7 +48303,7 @@ cont { symbol { name: "railway-crossing" apply_for_type: 1 - priority: 16594 + priority: 16653 } } } @@ -48247,7 +48314,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -48257,7 +48324,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -48267,7 +48334,7 @@ cont { lines { width: 1.2 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -48277,7 +48344,7 @@ cont { lines { width: 2.6 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -48288,7 +48355,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48298,7 +48365,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -48309,7 +48376,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48319,7 +48386,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -48330,7 +48397,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48340,7 +48407,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -48351,7 +48418,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48364,7 +48431,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -48374,14 +48441,14 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.0 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -48391,14 +48458,14 @@ cont { lines { width: 1.2 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -48408,21 +48475,21 @@ cont { lines { width: 2.6 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 5.0 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } lines { width: 5.4 color: 8421504 - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -48433,7 +48500,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48443,21 +48510,21 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 6.8 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.2 color: 8421504 - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -48468,7 +48535,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48478,21 +48545,21 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 8421504 - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -48503,7 +48570,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48513,21 +48580,21 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 8421504 - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -48538,7 +48605,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48551,7 +48618,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -48565,14 +48632,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -48586,14 +48653,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.2 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -48607,14 +48674,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 2.6 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -48625,7 +48692,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48639,14 +48706,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -48657,7 +48724,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48671,14 +48738,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -48689,7 +48756,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48703,14 +48770,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -48721,7 +48788,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48734,7 +48801,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -48744,7 +48811,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -48754,7 +48821,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48764,7 +48831,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48774,7 +48841,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48784,7 +48851,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48797,7 +48864,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -48807,7 +48874,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -48817,7 +48884,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48827,7 +48894,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48837,7 +48904,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48847,7 +48914,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48860,7 +48927,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -48870,7 +48937,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -48880,7 +48947,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48890,7 +48957,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48900,7 +48967,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48910,7 +48977,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48923,7 +48990,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -48933,7 +49000,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48943,7 +49010,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48953,7 +49020,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48963,7 +49030,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48976,7 +49043,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -48986,7 +49053,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48996,7 +49063,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49006,7 +49073,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49016,7 +49083,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49029,7 +49096,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -49039,7 +49106,7 @@ cont { lines { width: 1.2 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49049,7 +49116,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49059,7 +49126,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49069,7 +49136,7 @@ cont { lines { width: 2.0 color: 9868678 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49081,28 +49148,28 @@ cont { scale: 16 area { color: 15591638 - priority: -15883 + priority: -15872 } } element { scale: 17 area { color: 15591638 - priority: -15883 + priority: -15872 } } element { scale: 18 area { color: 15591638 - priority: -15883 + priority: -15872 } } element { scale: 19 area { color: 15591638 - priority: -15883 + priority: -15872 } } } @@ -49117,7 +49184,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49131,7 +49198,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49145,7 +49212,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49159,7 +49226,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49176,7 +49243,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49197,7 +49264,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49218,7 +49285,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49239,7 +49306,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49263,7 +49330,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49277,7 +49344,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49291,7 +49358,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49305,7 +49372,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49318,7 +49385,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -49328,7 +49395,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -49338,7 +49405,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -49348,7 +49415,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -49358,7 +49425,7 @@ cont { lines { width: 1.2 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -49368,7 +49435,7 @@ cont { lines { width: 2.6 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49379,7 +49446,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49389,7 +49456,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49400,7 +49467,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49410,7 +49477,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49421,7 +49488,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49431,7 +49498,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49442,7 +49509,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49455,7 +49522,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -49465,7 +49532,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -49475,7 +49542,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -49485,14 +49552,14 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } @@ -49502,14 +49569,14 @@ cont { lines { width: 1.2 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } @@ -49519,21 +49586,21 @@ cont { lines { width: 2.6 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 5.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 5.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -49544,7 +49611,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49554,21 +49621,21 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 6.8 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.2 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -49579,7 +49646,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49589,21 +49656,21 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -49614,7 +49681,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49624,21 +49691,21 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 15592411 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 8421504 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -49649,7 +49716,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49662,7 +49729,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -49672,7 +49739,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -49682,7 +49749,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -49692,7 +49759,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -49702,7 +49769,7 @@ cont { lines { width: 1.2 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -49712,7 +49779,7 @@ cont { lines { width: 2.6 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49723,7 +49790,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49733,7 +49800,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49744,7 +49811,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49754,7 +49821,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49765,7 +49832,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49775,7 +49842,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49786,7 +49853,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49799,7 +49866,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -49809,7 +49876,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -49819,7 +49886,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -49833,14 +49900,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -49854,14 +49921,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.2 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -49875,14 +49942,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 2.6 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49893,7 +49960,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49907,14 +49974,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49925,7 +49992,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49939,14 +50006,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49957,7 +50024,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49971,14 +50038,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49989,7 +50056,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -50002,7 +50069,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50010,7 +50077,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50018,7 +50085,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50026,7 +50093,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50034,7 +50101,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50042,7 +50109,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50050,7 +50117,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } } } @@ -50061,7 +50128,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50069,7 +50136,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50077,7 +50144,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50085,7 +50152,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50093,7 +50160,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50101,7 +50168,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50109,7 +50176,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } } } @@ -50120,7 +50187,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50128,7 +50195,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50136,7 +50203,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50144,7 +50211,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50152,7 +50219,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50160,7 +50227,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50168,7 +50235,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } } } @@ -50179,7 +50246,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -50188,7 +50255,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -50205,7 +50272,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50213,7 +50280,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50229,7 +50296,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50237,7 +50304,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50253,7 +50320,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50261,7 +50328,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50277,7 +50344,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50285,7 +50352,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50301,7 +50368,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50309,7 +50376,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50325,7 +50392,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -50336,7 +50403,7 @@ cont { symbol { name: "subway-barcelona-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -50345,7 +50412,7 @@ cont { symbol { name: "subway-barcelona-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -50362,7 +50429,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50370,7 +50437,7 @@ cont { symbol { name: "subway-barcelona-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50386,7 +50453,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50394,7 +50461,7 @@ cont { symbol { name: "subway-barcelona-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50410,7 +50477,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50418,7 +50485,7 @@ cont { symbol { name: "subway-barcelona-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50434,7 +50501,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50442,7 +50509,7 @@ cont { symbol { name: "subway-barcelona-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50458,7 +50525,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50466,7 +50533,7 @@ cont { symbol { name: "subway-barcelona-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50482,7 +50549,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -50493,7 +50560,7 @@ cont { symbol { name: "subway-berlin-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -50502,7 +50569,7 @@ cont { symbol { name: "subway-berlin-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -50519,7 +50586,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50527,7 +50594,7 @@ cont { symbol { name: "subway-berlin-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50543,7 +50610,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50551,7 +50618,7 @@ cont { symbol { name: "subway-berlin-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50567,7 +50634,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50575,7 +50642,7 @@ cont { symbol { name: "subway-berlin-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50591,7 +50658,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50599,7 +50666,7 @@ cont { symbol { name: "subway-berlin-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50615,7 +50682,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50623,7 +50690,7 @@ cont { symbol { name: "subway-berlin-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50639,7 +50706,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -50650,7 +50717,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -50659,7 +50726,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -50676,7 +50743,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50684,7 +50751,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50700,7 +50767,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50708,7 +50775,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50724,7 +50791,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50732,7 +50799,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50748,7 +50815,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50756,7 +50823,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50772,7 +50839,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50780,7 +50847,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50796,7 +50863,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -50807,7 +50874,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -50816,7 +50883,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -50833,7 +50900,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50841,7 +50908,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50857,7 +50924,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50865,7 +50932,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50881,7 +50948,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50889,7 +50956,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50905,7 +50972,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50913,7 +50980,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50929,7 +50996,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50937,7 +51004,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50953,7 +51020,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -50964,7 +51031,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -50973,7 +51040,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -50990,7 +51057,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50998,7 +51065,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51014,7 +51081,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51022,7 +51089,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51038,7 +51105,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51046,7 +51113,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51062,7 +51129,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51070,7 +51137,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51086,7 +51153,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51094,7 +51161,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51110,7 +51177,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -51121,7 +51188,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -51130,7 +51197,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -51147,7 +51214,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51155,7 +51222,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51171,7 +51238,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51179,7 +51246,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51195,7 +51262,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51203,7 +51270,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51219,7 +51286,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51227,7 +51294,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51243,7 +51310,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51251,7 +51318,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51267,7 +51334,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -51278,7 +51345,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -51287,7 +51354,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -51304,7 +51371,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51312,7 +51379,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51328,7 +51395,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51336,7 +51403,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51352,7 +51419,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51360,7 +51427,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51376,7 +51443,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51384,7 +51451,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51400,7 +51467,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51408,7 +51475,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51424,7 +51491,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -51435,7 +51502,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -51444,7 +51511,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -51461,7 +51528,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51469,7 +51536,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51485,7 +51552,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51493,7 +51560,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51509,7 +51576,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51517,7 +51584,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51533,7 +51600,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51541,7 +51608,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51557,7 +51624,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51565,7 +51632,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51581,7 +51648,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -51592,7 +51659,7 @@ cont { symbol { name: "subway-kiev-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -51602,7 +51669,7 @@ cont { stroke_color: 1308622847 offset_y: 8 } - priority: 15918 + priority: 15910 } } element { @@ -51610,7 +51677,7 @@ cont { symbol { name: "subway-kiev-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -51627,7 +51694,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51635,7 +51702,7 @@ cont { symbol { name: "subway-kiev-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51651,7 +51718,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51659,7 +51726,7 @@ cont { symbol { name: "subway-kiev-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51675,15 +51742,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 17 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51697,15 +51764,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 18 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51719,15 +51786,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 19 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51741,7 +51808,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -51752,7 +51819,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -51761,7 +51828,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -51778,7 +51845,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51786,7 +51853,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51802,7 +51869,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51810,7 +51877,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51826,7 +51893,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51834,7 +51901,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51850,7 +51917,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51858,7 +51925,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51874,7 +51941,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51882,7 +51949,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51898,7 +51965,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -51909,7 +51976,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -51918,7 +51985,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -51935,7 +52002,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51943,7 +52010,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51959,7 +52026,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51967,7 +52034,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51983,7 +52050,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51991,7 +52058,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52007,7 +52074,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52015,7 +52082,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52031,7 +52098,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52039,7 +52106,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52055,7 +52122,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -52066,7 +52133,7 @@ cont { symbol { name: "subway-london-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -52075,7 +52142,7 @@ cont { symbol { name: "subway-london-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -52092,7 +52159,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52100,7 +52167,7 @@ cont { symbol { name: "subway-london-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52116,7 +52183,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52124,7 +52191,7 @@ cont { symbol { name: "subway-london-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52140,7 +52207,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52148,7 +52215,7 @@ cont { symbol { name: "subway-london-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52164,7 +52231,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52172,7 +52239,7 @@ cont { symbol { name: "subway-london-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52188,7 +52255,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52196,7 +52263,7 @@ cont { symbol { name: "subway-london-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52212,7 +52279,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -52223,7 +52290,7 @@ cont { symbol { name: "subway-madrid-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -52232,7 +52299,7 @@ cont { symbol { name: "subway-madrid-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -52249,7 +52316,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52257,7 +52324,7 @@ cont { symbol { name: "subway-madrid-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52273,7 +52340,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52281,7 +52348,7 @@ cont { symbol { name: "subway-madrid-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52297,7 +52364,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52305,7 +52372,7 @@ cont { symbol { name: "subway-madrid-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52321,7 +52388,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52329,7 +52396,7 @@ cont { symbol { name: "subway-madrid-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52345,7 +52412,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52353,7 +52420,7 @@ cont { symbol { name: "subway-madrid-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52369,7 +52436,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -52380,7 +52447,7 @@ cont { symbol { name: "subway-minsk-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -52390,7 +52457,7 @@ cont { stroke_color: 1308622847 offset_y: 4 } - priority: 15918 + priority: 15910 } } element { @@ -52398,7 +52465,7 @@ cont { symbol { name: "subway-minsk-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -52415,7 +52482,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52423,7 +52490,7 @@ cont { symbol { name: "subway-minsk-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52439,15 +52506,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 16 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52461,15 +52528,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 17 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52483,15 +52550,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 18 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52505,15 +52572,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 19 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52527,7 +52594,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -52538,7 +52605,7 @@ cont { symbol { name: "subway-moscow-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -52547,7 +52614,7 @@ cont { symbol { name: "subway-moscow-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -52564,7 +52631,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52572,7 +52639,7 @@ cont { symbol { name: "subway-moscow-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -52589,7 +52656,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52597,7 +52664,7 @@ cont { symbol { name: "subway-moscow-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -52614,7 +52681,7 @@ cont { offset_y: 24 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52622,7 +52689,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52638,7 +52705,7 @@ cont { offset_y: 24 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52646,7 +52713,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52662,7 +52729,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52670,7 +52737,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52686,7 +52753,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52694,7 +52761,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52710,7 +52777,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52718,7 +52785,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52734,7 +52801,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -52745,7 +52812,7 @@ cont { symbol { name: "subway-newyork-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -52754,7 +52821,7 @@ cont { symbol { name: "subway-newyork-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -52771,7 +52838,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52779,7 +52846,7 @@ cont { symbol { name: "subway-newyork-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52795,7 +52862,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52803,7 +52870,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52819,7 +52886,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52827,7 +52894,7 @@ cont { symbol { name: "subway-newyork-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52843,7 +52910,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52851,7 +52918,7 @@ cont { symbol { name: "subway-newyork-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52867,7 +52934,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52875,7 +52942,7 @@ cont { symbol { name: "subway-newyork-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52891,7 +52958,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -52902,7 +52969,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -52911,7 +52978,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -52928,7 +52995,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52936,7 +53003,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52952,7 +53019,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52960,7 +53027,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52976,7 +53043,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52984,7 +53051,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53000,7 +53067,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53008,7 +53075,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53024,7 +53091,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53032,7 +53099,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53048,7 +53115,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -53059,7 +53126,7 @@ cont { symbol { name: "subway-paris-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -53068,7 +53135,7 @@ cont { symbol { name: "subway-paris-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -53085,7 +53152,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53093,7 +53160,7 @@ cont { symbol { name: "subway-paris-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53109,7 +53176,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53117,7 +53184,7 @@ cont { symbol { name: "subway-paris-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53133,7 +53200,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53141,7 +53208,7 @@ cont { symbol { name: "subway-paris-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53157,7 +53224,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53165,7 +53232,7 @@ cont { symbol { name: "subway-paris-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53181,7 +53248,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53189,7 +53256,7 @@ cont { symbol { name: "subway-paris-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53205,7 +53272,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -53216,7 +53283,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -53225,7 +53292,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -53242,7 +53309,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53250,7 +53317,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53266,7 +53333,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53274,7 +53341,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53290,7 +53357,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53298,7 +53365,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53314,7 +53381,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53322,7 +53389,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53338,7 +53405,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53346,7 +53413,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53362,7 +53429,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -53373,7 +53440,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -53382,7 +53449,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -53399,7 +53466,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53407,7 +53474,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53423,7 +53490,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53431,7 +53498,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53447,7 +53514,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53455,7 +53522,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53471,7 +53538,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53479,7 +53546,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53495,7 +53562,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53503,7 +53570,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53519,7 +53586,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -53530,7 +53597,7 @@ cont { symbol { name: "subway-rome-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -53539,7 +53606,7 @@ cont { symbol { name: "subway-rome-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -53556,7 +53623,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53564,7 +53631,7 @@ cont { symbol { name: "subway-rome-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53580,7 +53647,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53588,7 +53655,7 @@ cont { symbol { name: "subway-rome-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53604,15 +53671,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 17 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53626,15 +53693,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 18 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53648,15 +53715,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 19 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53670,7 +53737,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -53681,7 +53748,7 @@ cont { symbol { name: "subway-spb-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -53690,7 +53757,7 @@ cont { symbol { name: "subway-spb-s" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53706,7 +53773,7 @@ cont { offset_y: 5 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53714,7 +53781,7 @@ cont { symbol { name: "subway-spb-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -53731,7 +53798,7 @@ cont { offset_y: 5 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53739,7 +53806,7 @@ cont { symbol { name: "subway-spb-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -53756,7 +53823,7 @@ cont { offset_y: 24 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53764,7 +53831,7 @@ cont { symbol { name: "subway-spb-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53780,7 +53847,7 @@ cont { offset_y: 24 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53788,7 +53855,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53804,7 +53871,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53812,7 +53879,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53828,7 +53895,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53836,7 +53903,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53852,7 +53919,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53860,7 +53927,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53876,7 +53943,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -53887,7 +53954,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -53896,7 +53963,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -53913,7 +53980,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53921,7 +53988,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53937,7 +54004,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53945,7 +54012,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53961,7 +54028,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53969,7 +54036,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53985,7 +54052,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53993,7 +54060,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54009,7 +54076,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -54017,7 +54084,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54033,7 +54100,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -54044,7 +54111,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -54053,7 +54120,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -54070,7 +54137,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -54078,7 +54145,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54094,7 +54161,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -54102,7 +54169,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54118,7 +54185,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -54126,7 +54193,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54142,7 +54209,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -54150,7 +54217,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54166,7 +54233,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -54174,7 +54241,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54190,7 +54257,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -54211,7 +54278,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54219,7 +54286,7 @@ cont { symbol { name: "subway-entrance-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54235,7 +54302,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54243,7 +54310,7 @@ cont { symbol { name: "subway-entrance-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54259,7 +54326,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54267,7 +54334,7 @@ cont { symbol { name: "subway-entrance-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54283,7 +54350,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -54304,7 +54371,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54312,7 +54379,7 @@ cont { symbol { name: "subway-barcelona-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54328,7 +54395,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54336,7 +54403,7 @@ cont { symbol { name: "subway-barcelona-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54352,7 +54419,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54360,7 +54427,7 @@ cont { symbol { name: "subway-barcelona-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54376,7 +54443,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -54397,7 +54464,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54405,7 +54472,7 @@ cont { symbol { name: "subway-berlin-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54421,7 +54488,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54429,7 +54496,7 @@ cont { symbol { name: "subway-berlin-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54445,7 +54512,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54453,7 +54520,7 @@ cont { symbol { name: "subway-berlin-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54469,7 +54536,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -54490,7 +54557,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54498,7 +54565,7 @@ cont { symbol { name: "subway-kiev-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54514,7 +54581,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54522,7 +54589,7 @@ cont { symbol { name: "subway-kiev-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54538,7 +54605,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54546,7 +54613,7 @@ cont { symbol { name: "subway-kiev-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54562,7 +54629,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -54583,7 +54650,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54591,7 +54658,7 @@ cont { symbol { name: "subway-london-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54607,7 +54674,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54615,7 +54682,7 @@ cont { symbol { name: "subway-london-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54631,7 +54698,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54639,7 +54706,7 @@ cont { symbol { name: "subway-london-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54655,7 +54722,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -54676,7 +54743,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54684,7 +54751,7 @@ cont { symbol { name: "subway-madrid-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54700,7 +54767,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54708,7 +54775,7 @@ cont { symbol { name: "subway-madrid-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54724,7 +54791,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54732,7 +54799,7 @@ cont { symbol { name: "subway-madrid-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54748,7 +54815,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -54769,7 +54836,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54777,7 +54844,7 @@ cont { symbol { name: "subway-minsk-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54793,7 +54860,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54801,7 +54868,7 @@ cont { symbol { name: "subway-minsk-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54817,7 +54884,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54825,7 +54892,7 @@ cont { symbol { name: "subway-minsk-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54841,7 +54908,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -54852,7 +54919,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54868,7 +54935,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54876,7 +54943,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54892,7 +54959,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54900,7 +54967,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54916,7 +54983,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54924,7 +54991,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54940,7 +55007,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -54961,7 +55028,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54969,7 +55036,7 @@ cont { symbol { name: "subway-newyork-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54985,7 +55052,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54993,7 +55060,7 @@ cont { symbol { name: "subway-newyork-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55009,7 +55076,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55017,7 +55084,7 @@ cont { symbol { name: "subway-newyork-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55033,7 +55100,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -55054,7 +55121,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55062,7 +55129,7 @@ cont { symbol { name: "subway-paris-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55078,7 +55145,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55086,7 +55153,7 @@ cont { symbol { name: "subway-paris-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55102,7 +55169,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55110,7 +55177,7 @@ cont { symbol { name: "subway-paris-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55126,7 +55193,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -55147,7 +55214,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55155,7 +55222,7 @@ cont { symbol { name: "subway-rome-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55171,7 +55238,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55179,7 +55246,7 @@ cont { symbol { name: "subway-rome-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55195,7 +55262,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55203,7 +55270,7 @@ cont { symbol { name: "subway-rome-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55219,7 +55286,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -55230,7 +55297,7 @@ cont { symbol { name: "subway-spb-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55246,7 +55313,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55254,7 +55321,7 @@ cont { symbol { name: "subway-spb-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55270,7 +55337,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55278,7 +55345,7 @@ cont { symbol { name: "subway-spb-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55294,7 +55361,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55302,7 +55369,7 @@ cont { symbol { name: "subway-spb-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55318,7 +55385,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -55329,7 +55396,7 @@ cont { lines { width: 0.6 color: 1719302778 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -55339,7 +55406,7 @@ cont { lines { width: 0.6 color: 1719302778 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -55349,7 +55416,7 @@ cont { lines { width: 0.7 color: 863664762 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -55359,7 +55426,7 @@ cont { lines { width: 0.8 color: 444234362 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55369,7 +55436,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55379,7 +55446,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55389,7 +55456,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55402,7 +55469,7 @@ cont { lines { width: 0.6 color: 1719302778 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -55412,7 +55479,7 @@ cont { lines { width: 0.6 color: 1719302778 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -55422,7 +55489,7 @@ cont { lines { width: 0.7 color: 863664762 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -55432,7 +55499,7 @@ cont { lines { width: 0.8 color: 444234362 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55442,7 +55509,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55452,7 +55519,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55462,7 +55529,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55475,7 +55542,7 @@ cont { lines { width: 0.6 color: 1719302778 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -55485,7 +55552,7 @@ cont { lines { width: 0.6 color: 1719302778 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -55495,7 +55562,7 @@ cont { lines { width: 0.7 color: 863664762 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -55505,7 +55572,7 @@ cont { lines { width: 0.8 color: 444234362 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55515,7 +55582,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55525,7 +55592,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55535,7 +55602,7 @@ cont { lines { width: 1.0 color: 8026746 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55548,28 +55615,28 @@ cont { symbol { name: "tram-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { scale: 15 symbol { name: "tram-m" - priority: 16657 + priority: 16722 } } element { scale: 16 symbol { name: "tram-m" - priority: 16657 + priority: 16722 } } element { scale: 17 symbol { name: "tram-l" - priority: 16657 + priority: 16722 } caption { primary { @@ -55585,14 +55652,14 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { scale: 18 symbol { name: "tram-l" - priority: 16657 + priority: 16722 } caption { primary { @@ -55608,14 +55675,14 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { scale: 19 symbol { name: "tram-l" - priority: 16657 + priority: 16722 } caption { primary { @@ -55631,7 +55698,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -55642,7 +55709,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -55652,7 +55719,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -55662,7 +55729,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -55672,7 +55739,7 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -55682,7 +55749,7 @@ cont { lines { width: 1.2 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -55692,7 +55759,7 @@ cont { lines { width: 2.6 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -55703,7 +55770,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -55713,7 +55780,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -55724,7 +55791,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -55734,7 +55801,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -55745,7 +55812,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -55755,7 +55822,7 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -55766,7 +55833,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -55779,7 +55846,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -55789,7 +55856,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -55799,7 +55866,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -55809,14 +55876,14 @@ cont { lines { width: 1.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.0 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -55826,14 +55893,14 @@ cont { lines { width: 1.2 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -55843,21 +55910,21 @@ cont { lines { width: 2.6 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 5.0 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } lines { width: 5.4 color: 8421504 - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -55868,7 +55935,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -55878,21 +55945,21 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 6.8 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.2 color: 8421504 - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -55903,7 +55970,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -55913,21 +55980,21 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 8421504 - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -55938,7 +56005,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -55948,21 +56015,21 @@ cont { lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 15592411 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 8421504 - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -55973,7 +56040,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -55986,7 +56053,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -55996,7 +56063,7 @@ cont { lines { width: 0.6 color: 11710882 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -56006,7 +56073,7 @@ cont { lines { width: 0.8 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -56020,14 +56087,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -56041,14 +56108,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.2 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -56062,14 +56129,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 2.6 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -56080,7 +56147,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -56094,14 +56161,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -56112,7 +56179,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -56126,14 +56193,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -56144,7 +56211,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -56158,14 +56225,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 11710882 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -56176,7 +56243,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -56193,7 +56260,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: BEVELJOIN cap: BUTTCAP } @@ -56202,7 +56269,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56214,7 +56281,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: BEVELJOIN cap: BUTTCAP } @@ -56223,7 +56290,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56235,7 +56302,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: BEVELJOIN cap: BUTTCAP } @@ -56244,7 +56311,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56256,7 +56323,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: BUTTCAP } @@ -56265,7 +56332,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56277,7 +56344,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: BUTTCAP } @@ -56286,7 +56353,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56298,7 +56365,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: BUTTCAP } @@ -56307,7 +56374,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56319,7 +56386,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56328,7 +56395,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56340,7 +56407,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56349,7 +56416,7 @@ cont { height: 10 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56361,7 +56428,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56370,7 +56437,7 @@ cont { height: 10 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56382,7 +56449,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56391,7 +56458,7 @@ cont { height: 10 color: 4495803 } - priority: 16171 + priority: 16188 } } } @@ -56406,7 +56473,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: BEVELJOIN cap: BUTTCAP } @@ -56415,7 +56482,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56427,7 +56494,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: BEVELJOIN cap: BUTTCAP } @@ -56436,7 +56503,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56448,7 +56515,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: BEVELJOIN cap: BUTTCAP } @@ -56457,7 +56524,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56469,7 +56536,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: BUTTCAP } @@ -56478,7 +56545,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56490,7 +56557,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: BUTTCAP } @@ -56499,7 +56566,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56511,7 +56578,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: BUTTCAP } @@ -56520,7 +56587,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56532,7 +56599,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56541,7 +56608,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56553,7 +56620,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56562,7 +56629,7 @@ cont { height: 10 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56574,7 +56641,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56583,7 +56650,7 @@ cont { height: 10 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56595,7 +56662,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56604,7 +56671,7 @@ cont { height: 10 color: 4495803 } - priority: 16171 + priority: 16188 } } } @@ -56619,7 +56686,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: BEVELJOIN cap: BUTTCAP } @@ -56628,7 +56695,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56640,7 +56707,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: BEVELJOIN cap: BUTTCAP } @@ -56649,7 +56716,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56661,7 +56728,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: BEVELJOIN cap: BUTTCAP } @@ -56670,7 +56737,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56682,7 +56749,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: BUTTCAP } @@ -56691,7 +56758,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56703,7 +56770,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: BUTTCAP } @@ -56712,7 +56779,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56724,7 +56791,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: BUTTCAP } @@ -56733,7 +56800,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56745,7 +56812,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56754,7 +56821,7 @@ cont { height: 9 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56766,7 +56833,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56775,7 +56842,7 @@ cont { height: 10 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56787,7 +56854,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56796,7 +56863,7 @@ cont { height: 10 color: 4495803 } - priority: 16171 + priority: 16188 } } element { @@ -56808,7 +56875,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56817,7 +56884,7 @@ cont { height: 10 color: 4495803 } - priority: 16171 + priority: 16188 } } } @@ -56827,7 +56894,7 @@ cont { scale: 16 symbol { name: "shop-m" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -56836,14 +56903,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -56852,14 +56919,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -56868,14 +56935,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -56884,7 +56951,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -56893,8 +56960,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "alcohol-m" + priority: 16594 min_distance: 10 } caption { @@ -56903,14 +56970,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "alcohol-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -56919,14 +56986,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "alcohol-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -56935,14 +57002,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "alcohol-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -56951,7 +57018,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -56960,8 +57027,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "bakery-m" + priority: 16594 min_distance: 10 } caption { @@ -56970,14 +57037,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "bakery-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -56986,14 +57053,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "bakery-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57002,14 +57069,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "bakery-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57018,7 +57085,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57027,8 +57094,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "beauty-m" + priority: 16594 min_distance: 10 } caption { @@ -57037,14 +57104,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "beauty-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57053,14 +57120,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "beauty-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57069,14 +57136,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "beauty-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57085,7 +57152,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57094,8 +57161,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "alcohol-m" + priority: 16594 min_distance: 10 } caption { @@ -57104,14 +57171,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "alcohol-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57120,14 +57187,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "alcohol-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57136,14 +57203,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "alcohol-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57152,7 +57219,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57161,8 +57228,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "shop-bicycle-m" + priority: 16594 min_distance: 10 } caption { @@ -57171,14 +57238,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "shop-bicycle-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57187,14 +57254,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "shop-bicycle-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57203,14 +57270,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "shop-bicycle-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57219,7 +57286,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57228,8 +57295,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "bookmaker-m" + priority: 16594 min_distance: 10 } caption { @@ -57238,14 +57305,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "bookmaker-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57254,14 +57321,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "bookmaker-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57270,14 +57337,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "bookmaker-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57286,7 +57353,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57295,8 +57362,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "book-shop-m" + priority: 16594 min_distance: 10 } caption { @@ -57305,14 +57372,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "book-shop-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57321,14 +57388,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "book-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57337,14 +57404,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "book-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57353,7 +57420,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57362,8 +57429,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "butcher-m" + priority: 16594 min_distance: 10 } caption { @@ -57372,14 +57439,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "butcher-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57388,14 +57455,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "butcher-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57404,14 +57471,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "butcher-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57420,7 +57487,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57429,8 +57496,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "car_shop-m" + priority: 16594 min_distance: 10 } caption { @@ -57439,14 +57506,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "car_shop-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57455,14 +57522,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "car_shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57471,14 +57538,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "car_shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57487,7 +57554,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57496,8 +57563,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "car-part-m" + priority: 16594 min_distance: 10 } caption { @@ -57506,14 +57573,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "car-part-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57522,14 +57589,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "car-part-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57538,14 +57605,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "car-part-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57554,7 +57621,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57563,8 +57630,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "car-repair-m" + priority: 16594 min_distance: 10 } caption { @@ -57573,14 +57640,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "car-repair-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57589,14 +57656,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "car-repair-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57605,14 +57672,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "car-repair-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57621,7 +57688,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57631,7 +57698,7 @@ cont { scale: 15 symbol { name: "car-repair-s" - priority: 16594 + priority: 16653 min_distance: 20 } caption { @@ -57646,8 +57713,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16594 + name: "car-repair-m" + priority: 16653 min_distance: 10 } caption { @@ -57663,7 +57730,7 @@ cont { scale: 17 symbol { name: "car-repair-l" - priority: 16594 + priority: 16653 min_distance: 24 } caption { @@ -57672,14 +57739,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "car-repair-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -57688,14 +57755,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "car-repair-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -57704,7 +57771,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -57713,8 +57780,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "chemist-m" + priority: 16594 min_distance: 10 } caption { @@ -57723,14 +57790,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "chemist-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57739,14 +57806,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "chemist-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57755,14 +57822,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "chemist-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57771,7 +57838,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57780,8 +57847,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "clothes-m" + priority: 16594 min_distance: 10 } caption { @@ -57790,14 +57857,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "clothes-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57806,14 +57873,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "clothes-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57822,14 +57889,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "clothes-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57838,7 +57905,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57848,7 +57915,7 @@ cont { scale: 16 symbol { name: "shop-m" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57857,14 +57924,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57873,14 +57940,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57889,14 +57956,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57905,7 +57972,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57914,8 +57981,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "computer-m" + priority: 16594 min_distance: 10 } caption { @@ -57924,14 +57991,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "computer-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57940,14 +58007,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "computer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57956,14 +58023,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "computer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57972,7 +58039,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57981,8 +58048,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "sweets-m" + priority: 16594 min_distance: 10 } caption { @@ -57991,14 +58058,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "sweets-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58007,14 +58074,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "sweets-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58023,14 +58090,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "sweets-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58039,7 +58106,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58048,8 +58115,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "grocery-m" + priority: 16594 min_distance: 10 } caption { @@ -58058,14 +58125,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "grocery-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58074,14 +58141,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "grocery-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58090,14 +58157,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "grocery-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58106,7 +58173,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58115,8 +58182,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "copyshop-m" + priority: 16594 min_distance: 10 } caption { @@ -58125,14 +58192,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "copyshop-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58141,14 +58208,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "copyshop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58157,14 +58224,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "copyshop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58173,7 +58240,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58182,8 +58249,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "beauty-m" + priority: 16594 min_distance: 10 } caption { @@ -58192,14 +58259,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "beauty-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58208,14 +58275,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "beauty-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58224,14 +58291,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "beauty-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58240,7 +58307,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58249,8 +58316,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "department_store-m" + priority: 16594 min_distance: 10 } caption { @@ -58259,14 +58326,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "department_store-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58275,14 +58342,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "department_store-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58291,14 +58358,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "department_store-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58307,7 +58374,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58316,8 +58383,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "doityourself-m" + priority: 16594 min_distance: 10 } caption { @@ -58326,14 +58393,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "doityourself-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58342,14 +58409,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "doityourself-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58358,14 +58425,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "doityourself-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58374,7 +58441,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58383,8 +58450,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "laundry-m" + priority: 16594 min_distance: 10 } caption { @@ -58393,14 +58460,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "laundry-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58409,14 +58476,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "laundry-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58425,14 +58492,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "laundry-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58441,7 +58508,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58450,8 +58517,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "electronics-m" + priority: 16594 min_distance: 10 } caption { @@ -58460,14 +58527,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "electronics-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58476,14 +58543,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "electronics-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58492,14 +58559,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "electronics-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58508,7 +58575,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58517,8 +58584,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "florist-m" + priority: 16594 min_distance: 10 } caption { @@ -58527,14 +58594,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "florist-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58543,14 +58610,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "florist-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58559,14 +58626,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "florist-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58575,7 +58642,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58584,8 +58651,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "furniture-m" + priority: 16594 min_distance: 10 } caption { @@ -58594,14 +58661,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "furniture-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58610,14 +58677,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "furniture-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58626,14 +58693,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "furniture-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58642,7 +58709,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58651,8 +58718,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "garden_center-m" + priority: 16594 min_distance: 10 } caption { @@ -58661,14 +58728,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "garden_center-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58677,14 +58744,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "garden_center-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58693,14 +58760,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "garden_center-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58709,7 +58776,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58718,8 +58785,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "gift-m" + priority: 16594 min_distance: 10 } caption { @@ -58728,14 +58795,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "gift-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58744,14 +58811,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "gift-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58760,14 +58827,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "gift-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58776,7 +58843,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58785,8 +58852,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "greengrocer-m" + priority: 16594 min_distance: 10 } caption { @@ -58795,14 +58862,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "greengrocer-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58811,14 +58878,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "greengrocer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58827,14 +58894,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "greengrocer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58843,7 +58910,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58852,8 +58919,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "hairdresser-m" + priority: 16594 min_distance: 10 } caption { @@ -58862,14 +58929,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "hairdresser-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58878,14 +58945,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "hairdresser-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58894,14 +58961,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hairdresser-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58910,7 +58977,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58919,8 +58986,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "doityourself-m" + priority: 16594 min_distance: 10 } caption { @@ -58929,14 +58996,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "doityourself-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58945,14 +59012,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "doityourself-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58961,14 +59028,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "doityourself-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58977,7 +59044,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58986,8 +59053,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "jewelry-m" + priority: 16594 min_distance: 10 } caption { @@ -58996,14 +59063,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "jewelry-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59012,14 +59079,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "jewelry-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59028,14 +59095,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "jewelry-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59044,7 +59111,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59053,8 +59120,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "kiosk-m" + priority: 16594 min_distance: 10 } caption { @@ -59063,14 +59130,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "kiosk-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59079,14 +59146,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "kiosk-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59095,14 +59162,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "kiosk-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59111,7 +59178,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59120,8 +59187,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "laundry-m" + priority: 16594 min_distance: 10 } caption { @@ -59130,14 +59197,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "laundry-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59146,14 +59213,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "laundry-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59162,14 +59229,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "laundry-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59178,7 +59245,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59188,7 +59255,7 @@ cont { scale: 14 symbol { name: "shop-s" - priority: 16936 + priority: 16930 min_distance: 16 } caption { @@ -59197,14 +59264,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15936 + priority: 15930 } } element { scale: 15 symbol { name: "shop-m" - priority: 16936 + priority: 16930 min_distance: 16 } caption { @@ -59213,14 +59280,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15936 + priority: 15930 } } element { scale: 16 symbol { name: "shop-m" - priority: 16936 + priority: 16930 min_distance: 10 } caption { @@ -59229,14 +59296,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15936 + priority: 15930 } } element { scale: 17 symbol { name: "shop-l" - priority: 16936 + priority: 16930 min_distance: 10 } caption { @@ -59245,14 +59312,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15936 + priority: 15930 } } element { scale: 18 symbol { name: "shop-l" - priority: 16936 + priority: 16930 min_distance: 10 } caption { @@ -59261,14 +59328,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15936 + priority: 15930 } } element { scale: 19 symbol { name: "shop-l" - priority: 16936 + priority: 16930 min_distance: 10 } caption { @@ -59277,7 +59344,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15936 + priority: 15930 } } } @@ -59286,8 +59353,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "mobile_phone-m" + priority: 16594 min_distance: 10 } caption { @@ -59296,14 +59363,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "mobile_phone-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59312,14 +59379,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "mobile_phone-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59328,14 +59395,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "mobile_phone-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59344,7 +59411,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59353,8 +59420,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "optician-m" + priority: 16594 min_distance: 10 } caption { @@ -59363,14 +59430,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "optician-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59379,14 +59446,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "optician-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59395,14 +59462,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "optician-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59411,7 +59478,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59420,8 +59487,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "outdoor-shop-m" + priority: 16594 min_distance: 10 } caption { @@ -59430,14 +59497,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "outdoor-shop-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59446,14 +59513,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "outdoor-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59462,14 +59529,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "outdoor-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59478,7 +59545,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59487,8 +59554,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "petshop-m" + priority: 16594 min_distance: 10 } caption { @@ -59497,14 +59564,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "petshop-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59513,14 +59580,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "petshop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59529,14 +59596,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "petshop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59545,7 +59612,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59554,8 +59621,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "photo-shop-m" + priority: 16594 min_distance: 10 } caption { @@ -59564,14 +59631,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "photo-shop-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59580,14 +59647,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "photo-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59596,14 +59663,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "photo-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59612,7 +59679,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59621,8 +59688,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "seafood-shop-m" + priority: 16594 min_distance: 10 } caption { @@ -59631,14 +59698,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "seafood-shop-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59647,14 +59714,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "seafood-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59663,14 +59730,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "seafood-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59679,7 +59746,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59688,8 +59755,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "shoes-m" + priority: 16594 min_distance: 10 } caption { @@ -59698,14 +59765,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "shoes-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59714,14 +59781,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "shoes-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59730,14 +59797,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "shoes-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59746,7 +59813,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59755,8 +59822,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "sports-m" + priority: 16594 min_distance: 10 } caption { @@ -59765,14 +59832,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "sports-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59781,14 +59848,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "sports-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59797,14 +59864,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "sports-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59813,7 +59880,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59823,7 +59890,7 @@ cont { scale: 16 symbol { name: "shop-m" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -59832,14 +59899,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 17 symbol { name: "shop-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -59848,14 +59915,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "shop-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -59864,14 +59931,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "shop-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -59880,7 +59947,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -59890,7 +59957,7 @@ cont { scale: 16 symbol { name: "shop-m" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59899,14 +59966,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59915,14 +59982,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59931,14 +59998,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59947,7 +60014,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59956,8 +60023,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "ticket-shop-m" + priority: 16594 min_distance: 10 } caption { @@ -59966,14 +60033,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "ticket-shop-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59982,14 +60049,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "ticket-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59998,14 +60065,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "ticket-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60014,7 +60081,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -60023,8 +60090,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "toys-m" + priority: 16594 min_distance: 10 } caption { @@ -60033,14 +60100,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "toys-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -60049,14 +60116,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "toys-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60065,14 +60132,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "toys-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60081,7 +60148,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -60091,7 +60158,7 @@ cont { scale: 16 symbol { name: "shop-m" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60100,14 +60167,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60116,14 +60183,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60132,14 +60199,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60148,7 +60215,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -60157,8 +60224,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "car-repair-m" + priority: 16594 min_distance: 10 } caption { @@ -60167,14 +60234,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "car-repair-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -60183,14 +60250,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "car-repair-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60199,14 +60266,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "car-repair-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60215,7 +60282,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -60224,8 +60291,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "alcohol-m" + priority: 16594 min_distance: 10 } caption { @@ -60234,14 +60301,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "alcohol-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -60250,14 +60317,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "alcohol-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60266,14 +60333,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "alcohol-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60282,45 +60349,560 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } +cont { + name: "sponsored-booking" + element { + scale: 14 + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15782 + } + apply_if: "rating>=5" + } + element { + scale: 14 + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15792 + } + apply_if: "rating>=6" + } + element { + scale: 14 + symbol { + name: "hotel-s" + apply_for_type: 1 + priority: 16801 + min_distance: 24 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 6 + } + priority: 15801 + } + apply_if: "rating>=7" + } + element { + scale: 14 + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15811 + } + apply_if: "rating>=8" + } + element { + scale: 14 + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15821 + } + apply_if: "rating>=9" + } + element { + scale: 15 + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15782 + } + apply_if: "rating>=5" + } + element { + scale: 15 + symbol { + name: "hotel-m" + apply_for_type: 1 + priority: 16792 + min_distance: 32 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15792 + } + apply_if: "rating>=6" + } + element { + scale: 15 + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15801 + } + apply_if: "rating>=7" + } + element { + scale: 15 + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15811 + } + apply_if: "rating>=8" + } + element { + scale: 15 + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15821 + } + apply_if: "rating>=9" + } + element { + scale: 16 + symbol { + name: "hotel-m" + apply_for_type: 1 + priority: 16782 + min_distance: 24 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15782 + } + apply_if: "rating>=5" + } + element { + scale: 16 + symbol { + name: "hotel-m" + apply_for_type: 1 + priority: 16792 + min_distance: 24 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15792 + } + apply_if: "rating>=6" + } + element { + scale: 16 + symbol { + name: "hotel-m" + apply_for_type: 1 + priority: 16801 + min_distance: 24 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15801 + } + apply_if: "rating>=7" + } + element { + scale: 16 + symbol { + name: "hotel-m" + apply_for_type: 1 + priority: 16811 + min_distance: 24 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15811 + } + apply_if: "rating>=8" + } + element { + scale: 16 + symbol { + name: "hotel-m" + apply_for_type: 1 + priority: 16821 + min_distance: 24 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15821 + } + apply_if: "rating>=9" + } + element { + scale: 17 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16782 + min_distance: 16 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15782 + } + apply_if: "rating>=5" + } + element { + scale: 17 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16792 + min_distance: 16 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15792 + } + apply_if: "rating>=6" + } + element { + scale: 17 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16801 + min_distance: 16 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15801 + } + apply_if: "rating>=7" + } + element { + scale: 17 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16811 + min_distance: 16 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15811 + } + apply_if: "rating>=8" + } + element { + scale: 17 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16821 + min_distance: 16 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15821 + } + apply_if: "rating>=9" + } + element { + scale: 18 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16782 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15782 + } + apply_if: "rating>=5" + } + element { + scale: 18 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16792 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15792 + } + apply_if: "rating>=6" + } + element { + scale: 18 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16801 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15801 + } + apply_if: "rating>=7" + } + element { + scale: 18 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16811 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15811 + } + apply_if: "rating>=8" + } + element { + scale: 18 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16821 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15821 + } + apply_if: "rating>=9" + } + element { + scale: 19 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16782 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15782 + } + apply_if: "rating>=5" + } + element { + scale: 19 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16792 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15792 + } + apply_if: "rating>=6" + } + element { + scale: 19 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16801 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15801 + } + apply_if: "rating>=7" + } + element { + scale: 19 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16811 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15811 + } + apply_if: "rating>=8" + } + element { + scale: 19 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16821 + } + caption { + primary { + height: 10 + color: 4473924 + stroke_color: 872415231 + offset_y: 10 + } + priority: 15821 + } + apply_if: "rating>=9" + } +} cont { name: "sponsored-tinkoff" element { scale: 14 symbol { name: "atm-tinkoff-shield-l" - priority: 16576 + priority: 16633 } } element { scale: 15 symbol { name: "atm-tinkoff-shield-l" - priority: 16576 + priority: 16633 } } element { scale: 16 symbol { name: "atm-tinkoff-shield-l" - priority: 16576 + priority: 16633 } } element { scale: 17 symbol { name: "atm-tinkoff-shield-l" - priority: 16576 + priority: 16633 } } element { scale: 18 symbol { name: "atm-tinkoff-shield-l" - priority: 16576 + priority: 16633 } caption { primary { @@ -60328,14 +60910,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15576 + priority: 15633 } } element { scale: 19 symbol { name: "atm-tinkoff-shield-l" - priority: 16576 + priority: 16633 } caption { primary { @@ -60343,7 +60925,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15576 + priority: 15633 } } } @@ -60357,7 +60939,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -60365,7 +60947,7 @@ cont { symbol { name: "america-football-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -60373,7 +60955,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15558 + priority: 15613 } } element { @@ -60381,7 +60963,7 @@ cont { symbol { name: "america-football-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -60389,7 +60971,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15558 + priority: 15613 } } } @@ -60399,7 +60981,7 @@ cont { scale: 17 symbol { name: "archery-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60408,14 +60990,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "archery-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -60424,14 +61006,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } element { scale: 19 symbol { name: "archery-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -60440,7 +61022,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } } @@ -60454,7 +61036,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -60462,7 +61044,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -60470,7 +61052,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15558 + priority: 15613 } } element { @@ -60478,7 +61060,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -60486,7 +61068,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15558 + priority: 15613 } } } @@ -60496,7 +61078,7 @@ cont { scale: 17 symbol { name: "australian-football-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60505,14 +61087,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "australian-football-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -60521,14 +61103,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } element { scale: 19 symbol { name: "australian-football-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -60537,7 +61119,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } } @@ -60551,7 +61133,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -60559,7 +61141,7 @@ cont { symbol { name: "baseball-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -60567,7 +61149,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15558 + priority: 15613 } } element { @@ -60575,7 +61157,7 @@ cont { symbol { name: "baseball-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -60583,7 +61165,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15558 + priority: 15613 } } } @@ -60597,7 +61179,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -60605,7 +61187,7 @@ cont { symbol { name: "basketball-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -60613,7 +61195,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15558 + priority: 15613 } } element { @@ -60621,7 +61203,7 @@ cont { symbol { name: "basketball-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -60629,7 +61211,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15558 + priority: 15613 } } } @@ -60639,7 +61221,7 @@ cont { scale: 17 symbol { name: "bowls-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60648,14 +61230,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "bowls-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -60664,14 +61246,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } element { scale: 19 symbol { name: "bowls-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -60680,7 +61262,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } } @@ -60690,7 +61272,7 @@ cont { scale: 17 symbol { name: "cricket-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60699,14 +61281,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "cricket-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -60715,14 +61297,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } element { scale: 19 symbol { name: "cricket-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -60731,7 +61313,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } } @@ -60741,7 +61323,7 @@ cont { scale: 17 symbol { name: "curling-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60750,14 +61332,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "curling-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -60766,14 +61348,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } element { scale: 19 symbol { name: "curling-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -60782,7 +61364,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } } @@ -60792,7 +61374,7 @@ cont { scale: 17 symbol { name: "diving-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60801,14 +61383,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "diving-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -60817,14 +61399,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } element { scale: 19 symbol { name: "diving-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -60833,7 +61415,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } } @@ -60843,7 +61425,7 @@ cont { scale: 16 symbol { name: "equestrian-m" - priority: 16540 + priority: 16594 min_distance: 30 } } @@ -60851,7 +61433,7 @@ cont { scale: 17 symbol { name: "equestrian-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -60860,14 +61442,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "equestrian-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -60876,14 +61458,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "equestrian-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -60892,7 +61474,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -60902,7 +61484,7 @@ cont { scale: 17 symbol { name: "soccer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60911,14 +61493,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "soccer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60927,14 +61509,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "soccer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60943,7 +61525,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -60957,7 +61539,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -60965,7 +61547,7 @@ cont { symbol { name: "golf-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -60973,7 +61555,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15558 + priority: 15613 } } element { @@ -60981,7 +61563,7 @@ cont { symbol { name: "golf-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -60989,7 +61571,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15558 + priority: 15613 } } } @@ -61003,7 +61585,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -61011,7 +61593,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -61019,7 +61601,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15558 + priority: 15613 } } element { @@ -61027,7 +61609,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -61035,7 +61617,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15558 + priority: 15613 } } } @@ -61049,7 +61631,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -61060,7 +61642,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -61071,7 +61653,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -61081,12 +61663,12 @@ cont { scale: 17 area { color: 13749671 - priority: -15460 + priority: -15406 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61095,19 +61677,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 area { color: 13749671 - priority: -15460 + priority: -15406 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61116,19 +61698,19 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 area { color: 13749671 - priority: -15460 + priority: -15406 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61137,7 +61719,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -61147,7 +61729,7 @@ cont { scale: 17 symbol { name: "diving-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61156,14 +61738,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "diving-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -61172,14 +61754,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } element { scale: 19 symbol { name: "diving-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -61188,7 +61770,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } } @@ -61198,7 +61780,7 @@ cont { scale: 17 symbol { name: "archery-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61207,14 +61789,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "archery-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -61223,14 +61805,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } element { scale: 19 symbol { name: "archery-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -61239,7 +61821,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15549 + priority: 15603 } } } @@ -61253,7 +61835,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -61264,7 +61846,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -61275,7 +61857,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -61285,18 +61867,18 @@ cont { scale: 16 area { color: 13749671 - priority: -15460 + priority: -15406 } } element { scale: 17 area { color: 13749671 - priority: -15460 + priority: -15406 } symbol { name: "soccer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61305,18 +61887,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 area { color: 13749671 - priority: -15460 + priority: -15406 } symbol { name: "soccer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61325,18 +61907,18 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 area { color: 13749671 - priority: -15460 + priority: -15406 } symbol { name: "soccer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61345,7 +61927,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -61359,7 +61941,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -61367,7 +61949,7 @@ cont { symbol { name: "swimming-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -61375,7 +61957,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15558 + priority: 15613 } } element { @@ -61383,7 +61965,7 @@ cont { symbol { name: "swimming-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -61391,7 +61973,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15558 + priority: 15613 } } } @@ -61402,7 +61984,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -61411,7 +61993,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { @@ -61419,7 +62001,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -61428,7 +62010,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { @@ -61436,7 +62018,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -61445,41 +62027,17 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } } cont { name: "tourism-alpine_hut" - element { - scale: 14 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15684 - } - } - element { - scale: 15 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15684 - } - } element { scale: 16 symbol { name: "alpine_hut-m" - priority: 16684 + priority: 16752 min_distance: 24 } caption { @@ -61489,14 +62047,14 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15684 + priority: 15752 } } element { scale: 17 symbol { name: "alpine_hut-l" - priority: 16684 + priority: 16752 min_distance: 16 } caption { @@ -61506,14 +62064,14 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15684 + priority: 15752 } } element { scale: 18 symbol { name: "alpine_hut-l" - priority: 16684 + priority: 16752 } caption { primary { @@ -61522,14 +62080,14 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15684 + priority: 15752 } } element { scale: 19 symbol { name: "alpine_hut-l" - priority: 16684 + priority: 16752 } caption { primary { @@ -61538,41 +62096,17 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15684 + priority: 15752 } } } cont { name: "tourism-apartment" - element { - scale: 14 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15675 - } - } - element { - scale: 15 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15675 - } - } element { scale: 16 symbol { name: "motel-m" - priority: 16675 + priority: 16742 min_distance: 24 } caption { @@ -61582,14 +62116,14 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15675 + priority: 15742 } } element { scale: 17 symbol { name: "motel-l" - priority: 16675 + priority: 16742 min_distance: 16 } caption { @@ -61599,14 +62133,14 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15675 + priority: 15742 } } element { scale: 18 symbol { name: "motel-l" - priority: 16675 + priority: 16742 } caption { primary { @@ -61615,14 +62149,14 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15675 + priority: 15742 } } element { scale: 19 symbol { name: "motel-l" - priority: 16675 + priority: 16742 } caption { primary { @@ -61631,7 +62165,7 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15675 + priority: 15742 } } } @@ -61642,7 +62176,7 @@ cont { symbol { name: "tourism-m" apply_for_type: 1 - priority: 16846 + priority: 16831 min_distance: 8 } caption { @@ -61651,7 +62185,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15846 + priority: 15831 } } element { @@ -61659,7 +62193,7 @@ cont { symbol { name: "tourism-m" apply_for_type: 1 - priority: 16846 + priority: 16831 min_distance: 28 } caption { @@ -61668,7 +62202,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15846 + priority: 15831 } } element { @@ -61676,7 +62210,7 @@ cont { symbol { name: "tourism-l" apply_for_type: 1 - priority: 16846 + priority: 16831 min_distance: 24 } caption { @@ -61685,7 +62219,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15846 + priority: 15831 } } element { @@ -61693,7 +62227,7 @@ cont { symbol { name: "tourism-l" apply_for_type: 1 - priority: 16846 + priority: 16831 min_distance: 24 } caption { @@ -61702,7 +62236,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15846 + priority: 15831 } } element { @@ -61710,7 +62244,7 @@ cont { symbol { name: "tourism-l" apply_for_type: 1 - priority: 16846 + priority: 16831 min_distance: 24 } caption { @@ -61719,7 +62253,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15846 + priority: 15831 } } } @@ -61729,7 +62263,7 @@ cont { scale: 14 symbol { name: "tourism-s" - priority: 16855 + priority: 16841 min_distance: 12 } caption { @@ -61738,7 +62272,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { @@ -61746,7 +62280,7 @@ cont { symbol { name: "tourism-m" apply_for_type: 1 - priority: 16855 + priority: 16841 min_distance: 36 } caption { @@ -61755,14 +62289,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16855 + priority: 16841 min_distance: 36 } caption { @@ -61771,14 +62305,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 17 symbol { name: "tourism-l" - priority: 16855 + priority: 16841 min_distance: 24 } caption { @@ -61787,14 +62321,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 18 symbol { name: "tourism-l" - priority: 16855 + priority: 16841 min_distance: 24 } caption { @@ -61803,14 +62337,14 @@ cont { color: 4473924 offset_y: 12 } - priority: 15855 + priority: 15841 } } element { scale: 19 symbol { name: "tourism-l" - priority: 16855 + priority: 16841 min_distance: 24 } caption { @@ -61819,7 +62353,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15855 + priority: 15841 } } } @@ -61829,7 +62363,7 @@ cont { scale: 15 symbol { name: "campsite-m" - priority: 16567 + priority: 16623 min_distance: 12 } caption { @@ -61838,14 +62372,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 16 symbol { name: "campsite-m" - priority: 16567 + priority: 16623 min_distance: 12 } caption { @@ -61854,14 +62388,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 17 symbol { name: "campsite-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -61869,14 +62403,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 18 symbol { name: "campsite-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -61884,14 +62418,14 @@ cont { color: 4473924 offset_y: 12 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "campsite-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -61899,7 +62433,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15567 + priority: 15623 } } } @@ -61909,7 +62443,7 @@ cont { scale: 16 symbol { name: "caravan_site-m" - priority: 16540 + priority: 16594 min_distance: 30 } caption { @@ -61918,14 +62452,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "caravan_site-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -61934,14 +62468,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "caravan_site-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -61949,14 +62483,14 @@ cont { color: 4473924 offset_y: 12 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "caravan_site-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -61964,41 +62498,17 @@ cont { color: 4473924 offset_y: 12 } - priority: 15540 + priority: 15594 } } } cont { name: "tourism-chalet" - element { - scale: 14 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15684 - } - } - element { - scale: 15 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15684 - } - } element { scale: 16 symbol { name: "alpine_hut-m" - priority: 16684 + priority: 16752 min_distance: 24 } caption { @@ -62008,14 +62518,14 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15684 + priority: 15752 } } element { scale: 17 symbol { name: "alpine_hut-l" - priority: 16684 + priority: 16752 min_distance: 16 } caption { @@ -62025,14 +62535,14 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15684 + priority: 15752 } } element { scale: 18 symbol { name: "alpine_hut-l" - priority: 16684 + priority: 16752 } caption { primary { @@ -62041,14 +62551,14 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15684 + priority: 15752 } } element { scale: 19 symbol { name: "alpine_hut-l" - priority: 16684 + priority: 16752 } caption { primary { @@ -62057,7 +62567,7 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15684 + priority: 15752 } } } @@ -62068,7 +62578,7 @@ cont { symbol { name: "gallery-m" apply_for_type: 1 - priority: 16864 + priority: 16851 min_distance: 8 } caption { @@ -62077,14 +62587,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15864 + priority: 15851 } } element { scale: 16 symbol { name: "gallery-m" - priority: 16864 + priority: 16851 min_distance: 12 } caption { @@ -62093,14 +62603,14 @@ cont { color: 4473924 offset_y: 12 } - priority: 15864 + priority: 15851 } } element { scale: 17 symbol { name: "gallery-l" - priority: 16864 + priority: 16851 } caption { primary { @@ -62108,14 +62618,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15864 + priority: 15851 } } element { scale: 18 symbol { name: "gallery-l" - priority: 16864 + priority: 16851 } caption { primary { @@ -62123,14 +62633,14 @@ cont { color: 4473924 offset_y: 12 } - priority: 15864 + priority: 15851 } } element { scale: 19 symbol { name: "gallery-l" - priority: 16864 + priority: 16851 } caption { primary { @@ -62138,41 +62648,17 @@ cont { color: 4473924 offset_y: 12 } - priority: 15864 + priority: 15851 } } } cont { name: "tourism-guest_house" - element { - scale: 14 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15675 - } - } - element { - scale: 15 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15675 - } - } element { scale: 16 symbol { name: "motel-m" - priority: 16675 + priority: 16742 min_distance: 24 } caption { @@ -62182,14 +62668,14 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15675 + priority: 15742 } } element { scale: 17 symbol { name: "motel-l" - priority: 16675 + priority: 16742 min_distance: 16 } caption { @@ -62199,14 +62685,14 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15675 + priority: 15742 } } element { scale: 18 symbol { name: "motel-l" - priority: 16675 + priority: 16742 } caption { primary { @@ -62215,14 +62701,14 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15675 + priority: 15742 } } element { scale: 19 symbol { name: "motel-l" - priority: 16675 + priority: 16742 } caption { primary { @@ -62231,42 +62717,18 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15675 + priority: 15742 } } } cont { name: "tourism-hostel" - element { - scale: 14 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15666 - } - } - element { - scale: 15 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15666 - } - } element { scale: 16 symbol { name: "hotel-m" apply_for_type: 1 - priority: 16666 + priority: 16732 min_distance: 24 } caption { @@ -62276,7 +62738,7 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15666 + priority: 15732 } } element { @@ -62284,7 +62746,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16666 + priority: 16732 min_distance: 16 } caption { @@ -62294,7 +62756,7 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15666 + priority: 15732 } } element { @@ -62302,7 +62764,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16666 + priority: 16732 } caption { primary { @@ -62311,7 +62773,7 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15666 + priority: 15732 } } element { @@ -62319,7 +62781,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16666 + priority: 16732 } caption { primary { @@ -62328,42 +62790,18 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15666 + priority: 15732 } } } cont { name: "tourism-hotel" - element { - scale: 14 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15693 - } - } - element { - scale: 15 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15693 - } - } element { scale: 16 symbol { name: "hotel-m" apply_for_type: 1 - priority: 16693 + priority: 16762 min_distance: 24 } caption { @@ -62373,7 +62811,7 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15693 + priority: 15762 } } element { @@ -62381,7 +62819,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16693 + priority: 16762 min_distance: 16 } caption { @@ -62391,7 +62829,7 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15693 + priority: 15762 } } element { @@ -62399,7 +62837,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16693 + priority: 16762 } caption { primary { @@ -62408,7 +62846,7 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15693 + priority: 15762 } } element { @@ -62416,7 +62854,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16693 + priority: 16762 } caption { primary { @@ -62425,7 +62863,7 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15693 + priority: 15762 } } } @@ -62436,7 +62874,7 @@ cont { symbol { name: "information-m" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 10 } caption { @@ -62445,7 +62883,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -62453,7 +62891,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16531 + priority: 16584 } caption { primary { @@ -62461,7 +62899,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -62469,7 +62907,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -62477,7 +62915,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15540 + priority: 15594 } } element { @@ -62485,7 +62923,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -62493,7 +62931,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15540 + priority: 15594 } } } @@ -62504,7 +62942,7 @@ cont { symbol { name: "information-m" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 10 } caption { @@ -62513,7 +62951,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -62521,7 +62959,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16531 + priority: 16584 } caption { primary { @@ -62529,7 +62967,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -62537,7 +62975,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -62545,7 +62983,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15540 + priority: 15594 } } element { @@ -62553,7 +62991,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -62561,7 +62999,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15540 + priority: 15594 } } } @@ -62572,7 +63010,7 @@ cont { symbol { name: "information-m" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 10 } caption { @@ -62581,7 +63019,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -62589,7 +63027,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16531 + priority: 16584 } caption { primary { @@ -62597,7 +63035,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -62605,7 +63043,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -62613,7 +63051,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15540 + priority: 15594 } } element { @@ -62621,7 +63059,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -62629,7 +63067,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15540 + priority: 15594 } } } @@ -62640,7 +63078,7 @@ cont { symbol { name: "information-m" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 10 } caption { @@ -62649,7 +63087,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -62657,7 +63095,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16531 + priority: 16584 } caption { primary { @@ -62665,7 +63103,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -62673,7 +63111,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -62681,7 +63119,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15540 + priority: 15594 } } element { @@ -62689,7 +63127,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -62697,7 +63135,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15540 + priority: 15594 } } } @@ -62708,7 +63146,7 @@ cont { symbol { name: "information-m" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 10 } caption { @@ -62717,7 +63155,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -62725,7 +63163,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16531 + priority: 16584 } caption { primary { @@ -62733,7 +63171,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -62741,7 +63179,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -62749,7 +63187,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15540 + priority: 15594 } } element { @@ -62757,7 +63195,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -62765,41 +63203,17 @@ cont { color: 4473924 offset_y: 12 } - priority: 15540 + priority: 15594 } } } cont { name: "tourism-motel" - element { - scale: 14 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15666 - } - } - element { - scale: 15 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15666 - } - } element { scale: 16 symbol { name: "motel-m" - priority: 16666 + priority: 16732 min_distance: 24 } caption { @@ -62809,14 +63223,14 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15666 + priority: 15732 } } element { scale: 17 symbol { name: "motel-l" - priority: 16666 + priority: 16732 min_distance: 16 } caption { @@ -62826,14 +63240,14 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15666 + priority: 15732 } } element { scale: 18 symbol { name: "motel-l" - priority: 16666 + priority: 16732 } caption { primary { @@ -62842,14 +63256,14 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15666 + priority: 15732 } } element { scale: 19 symbol { name: "motel-l" - priority: 16666 + priority: 16732 } caption { primary { @@ -62858,7 +63272,7 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15666 + priority: 15732 } } } @@ -62868,7 +63282,7 @@ cont { scale: 13 symbol { name: "museum-s" - priority: 16873 + priority: 16861 min_distance: 16 } caption { @@ -62877,14 +63291,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15873 + priority: 15861 } } element { scale: 14 symbol { name: "museum-s" - priority: 16873 + priority: 16861 min_distance: 16 } caption { @@ -62893,14 +63307,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15873 + priority: 15861 } } element { scale: 15 symbol { name: "museum-m" - priority: 16873 + priority: 16861 min_distance: 24 } caption { @@ -62909,14 +63323,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15873 + priority: 15861 } } element { scale: 16 symbol { name: "museum-m" - priority: 16873 + priority: 16861 min_distance: 12 } caption { @@ -62925,14 +63339,14 @@ cont { color: 4473924 offset_y: 12 } - priority: 15873 + priority: 15861 } } element { scale: 17 symbol { name: "museum-l" - priority: 16873 + priority: 16861 } caption { primary { @@ -62940,14 +63354,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15873 + priority: 15861 } } element { scale: 18 symbol { name: "museum-l" - priority: 16873 + priority: 16861 } caption { primary { @@ -62955,14 +63369,14 @@ cont { color: 4473924 offset_y: 12 } - priority: 15873 + priority: 15861 } } element { scale: 19 symbol { name: "museum-l" - priority: 16873 + priority: 16861 } caption { primary { @@ -62970,7 +63384,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15873 + priority: 15861 } } } @@ -62980,7 +63394,7 @@ cont { scale: 16 symbol { name: "picnic-m" - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -62989,14 +63403,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 17 symbol { name: "picnic-l" - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -63005,14 +63419,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 18 symbol { name: "picnic-l" - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -63021,14 +63435,14 @@ cont { color: 4473924 offset_y: 12 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "picnic-l" - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -63037,41 +63451,17 @@ cont { color: 4473924 offset_y: 12 } - priority: 15567 + priority: 15623 } } } cont { name: "tourism-resort" - element { - scale: 14 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15684 - } - } - element { - scale: 15 - caption { - primary { - height: 10 - color: 4473924 - stroke_color: 872415231 - offset_y: 10 - } - priority: 15684 - } - } element { scale: 16 symbol { name: "alpine_hut-m" - priority: 16684 + priority: 16752 min_distance: 24 } caption { @@ -63081,14 +63471,14 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15684 + priority: 15752 } } element { scale: 17 symbol { name: "alpine_hut-l" - priority: 16684 + priority: 16752 min_distance: 16 } caption { @@ -63098,14 +63488,14 @@ cont { stroke_color: 872415231 offset_y: 10 } - priority: 15684 + priority: 15752 } } element { scale: 18 symbol { name: "alpine_hut-l" - priority: 16684 + priority: 16752 } caption { primary { @@ -63114,14 +63504,14 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15684 + priority: 15752 } } element { scale: 19 symbol { name: "alpine_hut-l" - priority: 16684 + priority: 16752 } caption { primary { @@ -63130,7 +63520,7 @@ cont { stroke_color: 872415231 offset_y: 12 } - priority: 15684 + priority: 15752 } } } @@ -63141,7 +63531,7 @@ cont { symbol { name: "viewpoint-s" apply_for_type: 1 - priority: 16891 + priority: 16881 min_distance: 8 } caption { @@ -63150,7 +63540,7 @@ cont { color: 4473924 offset_y: 6 } - priority: 15891 + priority: 15881 } } element { @@ -63158,7 +63548,7 @@ cont { symbol { name: "viewpoint-m" apply_for_type: 1 - priority: 16891 + priority: 16881 min_distance: 8 } caption { @@ -63167,7 +63557,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15891 + priority: 15881 } } element { @@ -63175,7 +63565,7 @@ cont { symbol { name: "viewpoint-m" apply_for_type: 1 - priority: 16891 + priority: 16881 min_distance: 8 } caption { @@ -63184,7 +63574,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15891 + priority: 15881 } } element { @@ -63192,7 +63582,7 @@ cont { symbol { name: "viewpoint-l" apply_for_type: 1 - priority: 16891 + priority: 16881 } caption { primary { @@ -63200,7 +63590,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15891 + priority: 15881 } } element { @@ -63208,7 +63598,7 @@ cont { symbol { name: "viewpoint-l" apply_for_type: 1 - priority: 16891 + priority: 16881 } caption { primary { @@ -63216,7 +63606,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15891 + priority: 15881 } } element { @@ -63224,7 +63614,7 @@ cont { symbol { name: "viewpoint-l" apply_for_type: 1 - priority: 16891 + priority: 16881 } caption { primary { @@ -63232,7 +63622,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15891 + priority: 15881 } } } @@ -63242,7 +63632,7 @@ cont { scale: 13 symbol { name: "zoo-s" - priority: 16900 + priority: 16891 min_distance: 12 } caption { @@ -63251,14 +63641,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15900 + priority: 15891 } } element { scale: 14 symbol { name: "zoo-s" - priority: 16900 + priority: 16891 min_distance: 12 } caption { @@ -63267,14 +63657,14 @@ cont { color: 4473924 offset_y: 6 } - priority: 15900 + priority: 15891 } } element { scale: 15 symbol { name: "zoo-m" - priority: 16900 + priority: 16891 min_distance: 8 } caption { @@ -63283,14 +63673,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15900 + priority: 15891 } } element { scale: 16 symbol { name: "zoo-m" - priority: 16900 + priority: 16891 min_distance: 8 } caption { @@ -63299,14 +63689,14 @@ cont { color: 4473924 offset_y: 12 } - priority: 15900 + priority: 15891 } } element { scale: 17 symbol { name: "zoo-l" - priority: 16900 + priority: 16891 } caption { primary { @@ -63314,14 +63704,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15900 + priority: 15891 } } element { scale: 18 symbol { name: "zoo-l" - priority: 16900 + priority: 16891 } caption { primary { @@ -63329,14 +63719,14 @@ cont { color: 4473924 offset_y: 12 } - priority: 15900 + priority: 15891 } } element { scale: 19 symbol { name: "zoo-l" - priority: 16900 + priority: 16891 } caption { primary { @@ -63344,7 +63734,7 @@ cont { color: 4473924 offset_y: 12 } - priority: 15900 + priority: 15891 } } } @@ -63364,7 +63754,7 @@ cont { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -63381,7 +63771,7 @@ cont { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -63398,7 +63788,7 @@ cont { height: 11 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -63415,7 +63805,7 @@ cont { height: 11 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -63432,7 +63822,7 @@ cont { height: 11 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -63449,7 +63839,7 @@ cont { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -63466,7 +63856,7 @@ cont { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } } @@ -63477,7 +63867,7 @@ cont { lines { width: 1.0 color: 8421504 - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: BUTTCAP } @@ -63486,7 +63876,7 @@ cont { height: 10 color: 4473924 } - priority: 16972 + priority: 16970 } } element { @@ -63494,7 +63884,7 @@ cont { lines { width: 1.0 color: 8421504 - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -63503,7 +63893,7 @@ cont { height: 10 color: 4473924 } - priority: 16972 + priority: 16970 } } element { @@ -63511,7 +63901,7 @@ cont { lines { width: 1.0 color: 8421504 - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -63520,7 +63910,7 @@ cont { height: 10 color: 4473924 } - priority: 16972 + priority: 16970 } } element { @@ -63528,7 +63918,7 @@ cont { lines { width: 1.0 color: 8421504 - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -63537,7 +63927,7 @@ cont { height: 10 color: 4473924 } - priority: 16972 + priority: 16970 } } element { @@ -63545,7 +63935,7 @@ cont { lines { width: 1.0 color: 8421504 - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -63554,7 +63944,7 @@ cont { height: 10 color: 4473924 } - priority: 16972 + priority: 16970 } } } @@ -63569,7 +63959,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -63583,7 +63973,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -63597,7 +63987,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -63609,140 +63999,140 @@ cont { scale: 0 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 1 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 2 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 3 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 4 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 5 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 6 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 7 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 8 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 9 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 10 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 11 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 12 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 13 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 14 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 15 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 16 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 17 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 18 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 19 area { color: 9163744 - priority: -15028 + priority: -15030 } } } @@ -63757,7 +64147,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -63771,7 +64161,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -63785,7 +64175,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -63841,7 +64231,7 @@ cont { symbol { name: "dot-m" apply_for_type: 1 - priority: 16153 + priority: 16168 } } element { @@ -63849,7 +64239,7 @@ cont { symbol { name: "dot-m" apply_for_type: 1 - priority: 16153 + priority: 16168 } } element { @@ -63857,7 +64247,7 @@ cont { symbol { name: "dot-m" apply_for_type: 1 - priority: 16153 + priority: 16168 } } element { @@ -63865,7 +64255,7 @@ cont { symbol { name: "dot-m" apply_for_type: 1 - priority: 16153 + priority: 16168 } } } @@ -63895,7 +64285,7 @@ cont { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -63912,7 +64302,7 @@ cont { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -63929,7 +64319,7 @@ cont { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -63946,7 +64336,7 @@ cont { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -63963,7 +64353,7 @@ cont { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -63980,7 +64370,7 @@ cont { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -63997,7 +64387,7 @@ cont { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64014,7 +64404,7 @@ cont { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64031,7 +64421,7 @@ cont { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } } @@ -64041,70 +64431,70 @@ cont { scale: 0 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 1 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 2 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 3 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 4 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 5 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 6 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 7 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 8 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { scale: 9 area { color: 9163744 - priority: -15028 + priority: -15030 } } element { @@ -64118,7 +64508,7 @@ cont { } area { color: 9163744 - priority: -15028 + priority: -15030 } } element { @@ -64132,14 +64522,14 @@ cont { } area { color: 9163744 - priority: -15028 + priority: -15030 } path_text { primary { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64153,14 +64543,14 @@ cont { } area { color: 9163744 - priority: -15028 + priority: -15030 } path_text { primary { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64174,14 +64564,14 @@ cont { } area { color: 9163744 - priority: -15028 + priority: -15030 } path_text { primary { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64195,14 +64585,14 @@ cont { } area { color: 9163744 - priority: -15028 + priority: -15030 } path_text { primary { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64216,14 +64606,14 @@ cont { } area { color: 9163744 - priority: -15028 + priority: -15030 } path_text { primary { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64237,14 +64627,14 @@ cont { } area { color: 9163744 - priority: -15028 + priority: -15030 } path_text { primary { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64258,14 +64648,14 @@ cont { } area { color: 9163744 - priority: -15028 + priority: -15030 } path_text { primary { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64279,14 +64669,14 @@ cont { } area { color: 9163744 - priority: -15028 + priority: -15030 } path_text { primary { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64300,14 +64690,14 @@ cont { } area { color: 9163744 - priority: -15028 + priority: -15030 } path_text { primary { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } } @@ -64327,7 +64717,7 @@ cont { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64344,7 +64734,7 @@ cont { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64361,7 +64751,7 @@ cont { height: 11 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64378,7 +64768,7 @@ cont { height: 11 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64395,7 +64785,7 @@ cont { height: 11 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64412,7 +64802,7 @@ cont { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64429,7 +64819,7 @@ cont { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } } @@ -64449,7 +64839,7 @@ cont { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64466,7 +64856,7 @@ cont { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64483,7 +64873,7 @@ cont { height: 11 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64500,7 +64890,7 @@ cont { height: 11 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64517,7 +64907,7 @@ cont { height: 11 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64534,7 +64924,7 @@ cont { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64551,7 +64941,7 @@ cont { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } } @@ -64575,7 +64965,7 @@ cont { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64596,7 +64986,7 @@ cont { height: 10 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64617,7 +65007,7 @@ cont { height: 11 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64638,7 +65028,7 @@ cont { height: 11 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64659,7 +65049,7 @@ cont { height: 11 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64680,7 +65070,7 @@ cont { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } element { @@ -64701,7 +65091,7 @@ cont { height: 12 color: 4495803 } - priority: 16972 + priority: 16970 } } } @@ -64711,7 +65101,7 @@ cont { scale: 11 symbol { name: "waterfall-s" - priority: 16531 + priority: 16584 min_distance: 15 } caption { @@ -64720,14 +65110,14 @@ cont { color: 4473924 offset_y: 5 } - priority: 15531 + priority: 15584 } } element { scale: 12 symbol { name: "waterfall-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -64735,14 +65125,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 13 symbol { name: "waterfall-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -64750,14 +65140,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 14 symbol { name: "waterfall-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -64765,14 +65155,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 15 symbol { name: "waterfall-m" - priority: 16531 + priority: 16584 } caption { primary { @@ -64780,14 +65170,14 @@ cont { color: 4473924 offset_y: 8 } - priority: 15531 + priority: 15584 } } element { scale: 16 symbol { name: "waterfall-m" - priority: 16531 + priority: 16584 } caption { primary { @@ -64795,14 +65185,14 @@ cont { color: 4473924 offset_y: 8 } - priority: 15531 + priority: 15584 } } element { scale: 17 symbol { name: "waterfall-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -64810,14 +65200,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "waterfall-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -64825,14 +65215,14 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "waterfall-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -64840,7 +65230,7 @@ cont { color: 4473924 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -64851,7 +65241,7 @@ cont { lines { width: 1.0 color: 8421504 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -64860,7 +65250,7 @@ cont { height: 10 color: 4473924 } - priority: 16423 + priority: 16465 } } element { @@ -64868,7 +65258,7 @@ cont { lines { width: 1.0 color: 8421504 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -64877,7 +65267,7 @@ cont { height: 10 color: 4473924 } - priority: 16423 + priority: 16465 } } element { @@ -64885,7 +65275,7 @@ cont { lines { width: 1.0 color: 8421504 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -64894,7 +65284,7 @@ cont { height: 10 color: 4473924 } - priority: 16423 + priority: 16465 } } element { @@ -64902,7 +65292,7 @@ cont { lines { width: 1.0 color: 8421504 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -64911,7 +65301,7 @@ cont { height: 10 color: 4473924 } - priority: 16423 + priority: 16465 } } element { @@ -64919,7 +65309,7 @@ cont { lines { width: 1.0 color: 8421504 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -64928,7 +65318,7 @@ cont { height: 10 color: 4473924 } - priority: 16423 + priority: 16465 } } } @@ -65037,7 +65427,7 @@ colors { } value { name: "RouteOutline" - color: 8853524 + color: 352205 x: 0 y: 0 } diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 5ccd499730..f53099cba7 100644 Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index f1a343d6ee..2d15ed5680 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -5,7 +5,7 @@ cont { lines { width: 0.5 color: 5131837 - priority: 1594 + priority: 1653 join: BEVELJOIN cap: BUTTCAP } @@ -16,14 +16,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: BEVELJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -32,7 +32,7 @@ cont { lines { width: 0.5 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -43,14 +43,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -59,7 +59,7 @@ cont { lines { width: 0.5 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -70,14 +70,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 } } element { @@ -85,7 +85,7 @@ cont { lines { width: 0.5 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -96,14 +96,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -112,7 +112,7 @@ cont { stroke_color: 1292964096 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -120,7 +120,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -131,14 +131,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -147,7 +147,7 @@ cont { stroke_color: 1292964096 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -155,7 +155,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -166,14 +166,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -182,7 +182,7 @@ cont { stroke_color: 1292964096 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -190,7 +190,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -201,14 +201,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -217,7 +217,7 @@ cont { stroke_color: 1292964096 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -225,7 +225,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -236,14 +236,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -252,7 +252,7 @@ cont { stroke_color: 1292964096 offset_y: 8 } - priority: 15594 + priority: 15653 } } } @@ -263,7 +263,7 @@ cont { lines { width: 0.5 color: 5131837 - priority: 1594 + priority: 1653 join: BEVELJOIN cap: BUTTCAP } @@ -274,14 +274,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: BEVELJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -290,7 +290,7 @@ cont { lines { width: 0.5 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -301,14 +301,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -317,7 +317,7 @@ cont { lines { width: 0.5 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -328,14 +328,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 } } element { @@ -343,7 +343,7 @@ cont { lines { width: 0.5 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -354,14 +354,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -370,7 +370,7 @@ cont { stroke_color: 1292964096 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -378,7 +378,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -389,14 +389,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -405,7 +405,7 @@ cont { stroke_color: 1292964096 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -413,7 +413,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -424,14 +424,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -440,7 +440,7 @@ cont { stroke_color: 1292964096 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -448,7 +448,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -459,14 +459,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -475,7 +475,7 @@ cont { stroke_color: 1292964096 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -483,7 +483,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -494,14 +494,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -510,7 +510,7 @@ cont { stroke_color: 1292964096 offset_y: 8 } - priority: 15594 + priority: 15653 } } } @@ -521,7 +521,7 @@ cont { lines { width: 0.5 color: 5131837 - priority: 1459 + priority: 1504 join: BEVELJOIN cap: BUTTCAP } @@ -532,7 +532,7 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: BEVELJOIN cap: BUTTCAP } @@ -542,7 +542,7 @@ cont { lines { width: 0.5 color: 5131837 - priority: 1459 + priority: 1504 join: ROUNDJOIN cap: BUTTCAP } @@ -553,7 +553,7 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } @@ -563,7 +563,7 @@ cont { lines { width: 0.5 color: 5131837 - priority: 1459 + priority: 1504 join: ROUNDJOIN cap: BUTTCAP } @@ -574,7 +574,7 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } @@ -584,7 +584,7 @@ cont { lines { width: 0.5 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -595,14 +595,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -611,7 +611,7 @@ cont { stroke_color: 1292964096 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -619,7 +619,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -630,14 +630,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -646,7 +646,7 @@ cont { stroke_color: 1292964096 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -654,7 +654,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -665,14 +665,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -681,7 +681,7 @@ cont { stroke_color: 1292964096 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -689,7 +689,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -700,14 +700,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -716,7 +716,7 @@ cont { stroke_color: 1292964096 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -724,7 +724,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -735,14 +735,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -751,7 +751,7 @@ cont { stroke_color: 1292964096 offset_y: 8 } - priority: 15594 + priority: 15653 } } } @@ -762,7 +762,7 @@ cont { lines { width: 0.5 color: 5131837 - priority: 1594 + priority: 1653 join: BEVELJOIN cap: BUTTCAP } @@ -773,14 +773,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: BEVELJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -789,7 +789,7 @@ cont { lines { width: 0.5 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -800,14 +800,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -816,7 +816,7 @@ cont { lines { width: 0.5 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -827,14 +827,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 } } element { @@ -842,7 +842,7 @@ cont { lines { width: 0.5 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -853,14 +853,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -869,7 +869,7 @@ cont { stroke_color: 1292964096 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -877,7 +877,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -888,14 +888,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -904,7 +904,7 @@ cont { stroke_color: 1292964096 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -912,7 +912,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -923,14 +923,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -939,7 +939,7 @@ cont { stroke_color: 1292964096 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -947,7 +947,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -958,14 +958,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -974,7 +974,7 @@ cont { stroke_color: 1292964096 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -982,7 +982,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -993,14 +993,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1009,7 +1009,7 @@ cont { stroke_color: 1292964096 offset_y: 8 } - priority: 15594 + priority: 15653 } } } @@ -1020,7 +1020,7 @@ cont { lines { width: 0.5 color: 5131837 - priority: 1594 + priority: 1653 join: BEVELJOIN cap: BUTTCAP } @@ -1031,14 +1031,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: BEVELJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -1047,7 +1047,7 @@ cont { lines { width: 0.5 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -1058,14 +1058,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -1074,7 +1074,7 @@ cont { lines { width: 0.5 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -1085,14 +1085,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 } } element { @@ -1100,7 +1100,7 @@ cont { lines { width: 0.5 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: BUTTCAP } @@ -1111,14 +1111,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: BUTTCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1127,7 +1127,7 @@ cont { stroke_color: 1292964096 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -1135,7 +1135,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -1146,14 +1146,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1162,7 +1162,7 @@ cont { stroke_color: 1292964096 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -1170,7 +1170,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -1181,14 +1181,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1197,7 +1197,7 @@ cont { stroke_color: 1292964096 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -1205,7 +1205,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -1216,14 +1216,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1232,7 +1232,7 @@ cont { stroke_color: 1292964096 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -1240,7 +1240,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1594 + priority: 1653 join: ROUNDJOIN cap: ROUNDCAP } @@ -1251,14 +1251,14 @@ cont { dd: 1.0 dd: 18.0 } - priority: 1450 + priority: 1495 join: ROUNDJOIN cap: ROUNDCAP } symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1267,7 +1267,7 @@ cont { stroke_color: 1292964096 offset_y: 8 } - priority: 15594 + priority: 15653 } } } @@ -1278,7 +1278,7 @@ cont { symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -1287,7 +1287,7 @@ cont { symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 min_distance: 10 } } @@ -1296,7 +1296,7 @@ cont { symbol { name: "cable-car-s" apply_for_type: 1 - priority: 16594 + priority: 16653 } } element { @@ -1304,7 +1304,7 @@ cont { symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1313,7 +1313,7 @@ cont { stroke_color: 1292964096 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -1321,7 +1321,7 @@ cont { symbol { name: "cable-car-m" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1330,7 +1330,7 @@ cont { stroke_color: 1292964096 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { @@ -1338,7 +1338,7 @@ cont { symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1347,7 +1347,7 @@ cont { stroke_color: 1292964096 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -1355,7 +1355,7 @@ cont { symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1364,7 +1364,7 @@ cont { stroke_color: 1292964096 offset_y: 8 } - priority: 15594 + priority: 15653 } } element { @@ -1372,7 +1372,7 @@ cont { symbol { name: "cable-car-l" apply_for_type: 1 - priority: 16594 + priority: 16653 } caption { primary { @@ -1381,7 +1381,7 @@ cont { stroke_color: 1292964096 offset_y: 8 } - priority: 15594 + priority: 15653 } } } @@ -1391,7 +1391,7 @@ cont { scale: 10 area { color: 3681605 - priority: -15046 + priority: -15050 } caption { primary { @@ -1399,14 +1399,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 15954 + priority: 15950 } } element { scale: 11 area { color: 3418688 - priority: -15046 + priority: -15050 } caption { primary { @@ -1414,14 +1414,14 @@ cont { color: 8947848 stroke_color: 1292964096 } - priority: 15954 + priority: 15950 } } element { scale: 12 area { color: 3155515 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" @@ -1441,14 +1441,14 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 13 area { color: 3155515 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" @@ -1468,14 +1468,14 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 14 area { color: 2827062 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" @@ -1495,18 +1495,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 15 area { color: 2695475 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" - priority: 16954 + priority: 16950 } caption { primary { @@ -1522,18 +1522,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 16 area { color: 2695475 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" - priority: 16954 + priority: 16950 } caption { primary { @@ -1549,18 +1549,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 17 area { color: 2695475 - priority: -15046 + priority: -15050 } symbol { name: "airport-l" - priority: 16954 + priority: 16950 } caption { primary { @@ -1576,18 +1576,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 18 area { color: 2695475 - priority: -15046 + priority: -15050 } symbol { name: "airport-l" - priority: 16954 + priority: 16950 } caption { primary { @@ -1603,18 +1603,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 19 area { color: 2695475 - priority: -15046 + priority: -15050 } symbol { name: "airport-l" - priority: 16954 + priority: 16950 } caption { primary { @@ -1630,7 +1630,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } } @@ -1640,11 +1640,11 @@ cont { scale: 10 area { color: 3681605 - priority: -15046 + priority: -15050 } symbol { name: "airport-s" - priority: 16954 + priority: 16950 } caption { primary { @@ -1653,14 +1653,14 @@ cont { stroke_color: 1292964096 offset_y: 7 } - priority: 15954 + priority: 15950 } } element { scale: 11 area { color: 3418688 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" @@ -1673,14 +1673,14 @@ cont { stroke_color: 1292964096 offset_y: 7 } - priority: 15954 + priority: 15950 } } element { scale: 12 area { color: 3155515 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" @@ -1700,14 +1700,14 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 13 area { color: 3155515 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" @@ -1727,14 +1727,14 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 14 area { color: 2827062 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" @@ -1754,18 +1754,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 15 area { color: 2695475 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" - priority: 16954 + priority: 16950 } caption { primary { @@ -1781,18 +1781,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 16 area { color: 2695475 - priority: -15046 + priority: -15050 } symbol { name: "airport-m" - priority: 16954 + priority: 16950 } caption { primary { @@ -1808,18 +1808,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 17 area { color: 2695475 - priority: -15046 + priority: -15050 } symbol { name: "airport-l" - priority: 16954 + priority: 16950 } caption { primary { @@ -1835,18 +1835,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 18 area { color: 2695475 - priority: -15046 + priority: -15050 } symbol { name: "airport-l" - priority: 16954 + priority: 16950 } caption { primary { @@ -1862,18 +1862,18 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } element { scale: 19 area { color: 2695475 - priority: -15046 + priority: -15050 } symbol { name: "airport-l" - priority: 16954 + priority: 16950 } caption { primary { @@ -1889,7 +1889,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15954 + priority: 15950 } } } @@ -1899,7 +1899,7 @@ cont { scale: 17 symbol { name: "gate-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -1907,14 +1907,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "gate-l" - priority: 16981 + priority: 16980 } caption { primary { @@ -1922,14 +1922,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15981 + priority: 15980 } } element { scale: 19 symbol { name: "gate-l" - priority: 16981 + priority: 16980 } caption { primary { @@ -1937,7 +1937,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15981 + priority: 15980 } } } @@ -1947,7 +1947,7 @@ cont { scale: 17 symbol { name: "helipad-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -1955,14 +1955,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "helipad-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -1970,14 +1970,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "helipad-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -1985,7 +1985,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -1996,7 +1996,7 @@ cont { lines { width: 1.0 color: 2150311975 - priority: 1135 + priority: 1148 join: BEVELJOIN cap: BUTTCAP } @@ -2006,7 +2006,7 @@ cont { lines { width: 1.5 color: 858466343 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: BUTTCAP } @@ -2016,7 +2016,7 @@ cont { lines { width: 2.4 color: 2828327 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: BUTTCAP } @@ -2026,7 +2026,7 @@ cont { lines { width: 2.4 color: 2828327 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: BUTTCAP } @@ -2036,7 +2036,7 @@ cont { lines { width: 4.0 color: 2828327 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: ROUNDCAP } @@ -2046,7 +2046,7 @@ cont { lines { width: 4.0 color: 2828327 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: ROUNDCAP } @@ -2056,7 +2056,7 @@ cont { lines { width: 4.0 color: 2828327 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: ROUNDCAP } @@ -2066,7 +2066,7 @@ cont { lines { width: 4.0 color: 2828327 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: ROUNDCAP } @@ -2079,7 +2079,7 @@ cont { lines { width: 0.6 color: 1714104359 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: BUTTCAP } @@ -2089,7 +2089,7 @@ cont { lines { width: 1.2 color: 1714104359 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: BUTTCAP } @@ -2099,7 +2099,7 @@ cont { lines { width: 1.2 color: 1714104359 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: ROUNDCAP } @@ -2109,7 +2109,7 @@ cont { lines { width: 1.2 color: 1714104359 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: ROUNDCAP } @@ -2119,7 +2119,7 @@ cont { lines { width: 1.2 color: 1714104359 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: ROUNDCAP } @@ -2129,7 +2129,7 @@ cont { lines { width: 1.2 color: 1714104359 - priority: 1135 + priority: 1148 join: ROUNDJOIN cap: ROUNDCAP } @@ -2145,7 +2145,7 @@ cont { width: 1.0 color: 3158064 } - priority: -15793 + priority: -15773 } } element { @@ -2156,14 +2156,14 @@ cont { width: 1.0 color: 3158064 } - priority: -15793 + priority: -15773 } caption { primary { height: 9 color: 5592405 } - priority: 15207 + priority: 15227 } } element { @@ -2174,14 +2174,14 @@ cont { width: 1.0 color: 4671303 } - priority: -15793 + priority: -15773 } caption { primary { height: 9 color: 5592405 } - priority: 15207 + priority: 15227 } } element { @@ -2192,14 +2192,14 @@ cont { width: 1.0 color: 4671303 } - priority: -15793 + priority: -15773 } caption { primary { height: 9 color: 5592405 } - priority: 15207 + priority: 15227 } } element { @@ -2210,14 +2210,14 @@ cont { width: 1.0 color: 4671303 } - priority: -15793 + priority: -15773 } caption { primary { height: 9 color: 5592405 } - priority: 15207 + priority: 15227 } } element { @@ -2228,14 +2228,14 @@ cont { width: 1.0 color: 4671303 } - priority: -15793 + priority: -15773 } caption { primary { height: 9 color: 5592405 } - priority: 15207 + priority: 15227 } } } @@ -2259,7 +2259,7 @@ cont { scale: 18 symbol { name: "atm-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -2267,14 +2267,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "atm-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -2282,7 +2282,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -2292,7 +2292,7 @@ cont { scale: 16 symbol { name: "bank-m" - priority: 16594 + priority: 16653 } caption { primary { @@ -2300,14 +2300,14 @@ cont { color: 5592405 offset_y: 6 } - priority: 15594 + priority: 15653 } } element { scale: 17 symbol { name: "bank-m" - priority: 16594 + priority: 16653 } caption { primary { @@ -2315,14 +2315,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "bank-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -2330,14 +2330,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "bank-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -2345,7 +2345,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -2355,7 +2355,7 @@ cont { scale: 15 symbol { name: "beer-m" - priority: 16621 + priority: 16683 min_distance: 28 } caption { @@ -2364,14 +2364,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15621 + priority: 15683 } } element { scale: 16 symbol { name: "beer-m" - priority: 16621 + priority: 16683 min_distance: 12 } caption { @@ -2380,14 +2380,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15621 + priority: 15683 } } element { scale: 17 symbol { name: "beer-l" - priority: 16621 + priority: 16683 min_distance: 12 } caption { @@ -2396,14 +2396,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15621 + priority: 15683 } } element { scale: 18 symbol { name: "beer-l" - priority: 16621 + priority: 16683 } caption { primary { @@ -2411,14 +2411,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15621 + priority: 15683 } } element { scale: 19 symbol { name: "beer-l" - priority: 16621 + priority: 16683 } caption { primary { @@ -2426,7 +2426,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15621 + priority: 15683 } } } @@ -2436,7 +2436,7 @@ cont { scale: 18 symbol { name: "bbq-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -2451,7 +2451,7 @@ cont { scale: 19 symbol { name: "bbq-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -2470,7 +2470,7 @@ cont { symbol { name: "bench" apply_for_type: 1 - priority: 16522 + priority: 16574 } } element { @@ -2478,7 +2478,7 @@ cont { symbol { name: "bench" apply_for_type: 1 - priority: 16522 + priority: 16574 } caption { primary { @@ -2486,7 +2486,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15522 + priority: 15574 } } } @@ -2496,7 +2496,7 @@ cont { scale: 17 symbol { name: "bike-parking-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -2505,14 +2505,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "bike-parking-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -2521,14 +2521,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "bike-parking-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -2537,7 +2537,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -2547,7 +2547,7 @@ cont { scale: 17 symbol { name: "bicycle-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -2555,14 +2555,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 18 symbol { name: "bicycle-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -2570,14 +2570,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "bicycle-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -2585,7 +2585,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -2610,7 +2610,7 @@ cont { symbol { name: "banknote-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } } element { @@ -2618,7 +2618,7 @@ cont { symbol { name: "banknote-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } caption { primary { @@ -2626,7 +2626,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { @@ -2634,7 +2634,7 @@ cont { symbol { name: "banknote-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } caption { primary { @@ -2642,7 +2642,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -2652,7 +2652,7 @@ cont { scale: 12 symbol { name: "bus-s" - priority: 16603 + priority: 16663 min_distance: 1 } } @@ -2660,7 +2660,7 @@ cont { scale: 13 symbol { name: "bus-s" - priority: 16603 + priority: 16663 min_distance: 1 } } @@ -2668,7 +2668,7 @@ cont { scale: 14 symbol { name: "bus-s" - priority: 16603 + priority: 16663 } caption { primary { @@ -2684,14 +2684,14 @@ cont { offset_y: 20 text: "int_name" } - priority: 15603 + priority: 15663 } } element { scale: 15 symbol { name: "bus-m" - priority: 16603 + priority: 16663 } caption { primary { @@ -2707,14 +2707,14 @@ cont { offset_y: 8 text: "int_name" } - priority: 15603 + priority: 15663 } } element { scale: 16 symbol { name: "bus-m" - priority: 16603 + priority: 16663 } caption { primary { @@ -2730,14 +2730,14 @@ cont { offset_y: 8 text: "int_name" } - priority: 15603 + priority: 15663 } } element { scale: 17 symbol { name: "bus-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -2753,14 +2753,14 @@ cont { offset_y: 8 text: "int_name" } - priority: 15603 + priority: 15663 } } element { scale: 18 symbol { name: "bus-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -2776,14 +2776,14 @@ cont { offset_y: 8 text: "int_name" } - priority: 15603 + priority: 15663 } } element { scale: 19 symbol { name: "bus-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -2799,7 +2799,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15603 + priority: 15663 } } } @@ -2809,7 +2809,7 @@ cont { scale: 15 symbol { name: "cafe-m" - priority: 16648 + priority: 16712 min_distance: 12 } caption { @@ -2818,14 +2818,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15648 + priority: 15712 } } element { scale: 16 symbol { name: "cafe-m" - priority: 16648 + priority: 16712 min_distance: 12 } caption { @@ -2834,14 +2834,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15648 + priority: 15712 } } element { scale: 17 symbol { name: "cafe-l" - priority: 16648 + priority: 16712 min_distance: 12 } caption { @@ -2850,14 +2850,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15648 + priority: 15712 } } element { scale: 18 symbol { name: "cafe-l" - priority: 16648 + priority: 16712 } caption { primary { @@ -2865,14 +2865,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15648 + priority: 15712 } } element { scale: 19 symbol { name: "cafe-l" - priority: 16648 + priority: 16712 } caption { primary { @@ -2880,7 +2880,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15648 + priority: 15712 } } } @@ -2890,7 +2890,7 @@ cont { scale: 18 symbol { name: "car_sharing-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -2898,14 +2898,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "car_sharing-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -2913,7 +2913,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -2923,7 +2923,7 @@ cont { scale: 18 symbol { name: "car_sharing-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -2931,14 +2931,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "car_sharing-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -2946,7 +2946,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -2956,7 +2956,7 @@ cont { scale: 17 symbol { name: "car-wash-l" - priority: 16567 + priority: 16623 min_distance: 24 } caption { @@ -2965,7 +2965,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { @@ -2973,7 +2973,7 @@ cont { symbol { name: "car-wash-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } caption { primary { @@ -2981,7 +2981,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { @@ -2989,7 +2989,7 @@ cont { symbol { name: "car-wash-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } caption { primary { @@ -2997,7 +2997,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -3007,7 +3007,7 @@ cont { scale: 17 symbol { name: "casino-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -3016,14 +3016,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "casino-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -3032,14 +3032,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "casino-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -3048,7 +3048,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -3058,7 +3058,7 @@ cont { scale: 14 symbol { name: "charging-station-s" - priority: 16585 + priority: 16643 min_distance: 20 } caption { @@ -3074,7 +3074,7 @@ cont { scale: 15 symbol { name: "charging-station-m" - priority: 16585 + priority: 16643 min_distance: 20 } caption { @@ -3090,7 +3090,7 @@ cont { scale: 16 symbol { name: "charging-station-m" - priority: 16585 + priority: 16643 min_distance: 10 } caption { @@ -3106,7 +3106,7 @@ cont { scale: 17 symbol { name: "charging-station-l" - priority: 16585 + priority: 16643 } caption { primary { @@ -3114,14 +3114,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15585 + priority: 15643 } } element { scale: 18 symbol { name: "charging-station-l" - priority: 16585 + priority: 16643 } caption { primary { @@ -3129,14 +3129,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15585 + priority: 15643 } } element { scale: 19 symbol { name: "charging-station-l" - priority: 16585 + priority: 16643 } caption { primary { @@ -3144,7 +3144,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15585 + priority: 15643 } } } @@ -3154,7 +3154,7 @@ cont { scale: 17 symbol { name: "kindergarten-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -3162,14 +3162,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "kindergarten-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -3177,14 +3177,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "kindergarten-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -3192,7 +3192,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -3202,7 +3202,7 @@ cont { scale: 17 symbol { name: "cinema-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3210,14 +3210,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "cinema-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3225,14 +3225,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "cinema-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3240,7 +3240,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -3250,7 +3250,7 @@ cont { scale: 17 symbol { name: "hospital-l" - priority: 16594 + priority: 16653 min_distance: 4 } caption { @@ -3259,14 +3259,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "hospital-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3274,14 +3274,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "hospital-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3289,7 +3289,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -3299,7 +3299,7 @@ cont { scale: 17 symbol { name: "college-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3307,14 +3307,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "college-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3322,14 +3322,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "college-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3337,7 +3337,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -3347,7 +3347,7 @@ cont { scale: 14 symbol { name: "tourism-s" - priority: 16846 + priority: 16831 min_distance: 8 } caption { @@ -3356,14 +3356,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15846 + priority: 15831 } } element { scale: 15 symbol { name: "tourism-m" - priority: 16846 + priority: 16831 min_distance: 24 } caption { @@ -3372,14 +3372,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15846 + priority: 15831 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16846 + priority: 16831 min_distance: 16 } caption { @@ -3388,7 +3388,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15846 + priority: 15831 } } element { @@ -3399,7 +3399,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15846 + priority: 15831 } } element { @@ -3410,7 +3410,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15846 + priority: 15831 } } element { @@ -3421,7 +3421,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15846 + priority: 15831 } } } @@ -3431,7 +3431,7 @@ cont { scale: 17 symbol { name: "public-building-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3439,14 +3439,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "public-building-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3454,14 +3454,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "public-building-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3469,7 +3469,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -3479,7 +3479,7 @@ cont { scale: 17 symbol { name: "dentist-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -3487,14 +3487,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "dentist-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -3502,14 +3502,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "dentist-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -3517,7 +3517,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -3527,32 +3527,32 @@ cont { scale: 14 area { color: 2496790 - priority: -15406 + priority: -15347 } } element { scale: 15 area { color: 2496790 - priority: -15406 + priority: -15347 } } element { scale: 16 area { color: 2496790 - priority: -15406 + priority: -15347 } } element { scale: 17 area { color: 2496790 - priority: -15406 + priority: -15347 } symbol { name: "hospital-l" - priority: 16594 + priority: 16653 min_distance: 4 } caption { @@ -3561,18 +3561,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 area { color: 2496790 - priority: -15406 + priority: -15347 } symbol { name: "hospital-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3580,18 +3580,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 area { color: 2496790 - priority: -15406 + priority: -15347 } symbol { name: "hospital-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3599,7 +3599,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -3609,7 +3609,7 @@ cont { scale: 15 symbol { name: "drinking-water-m" - priority: 16522 + priority: 16574 min_distance: 36 } } @@ -3617,7 +3617,7 @@ cont { scale: 16 symbol { name: "drinking-water-m" - priority: 16522 + priority: 16574 min_distance: 36 } } @@ -3625,21 +3625,21 @@ cont { scale: 17 symbol { name: "drinking-water-l" - priority: 16522 + priority: 16574 } } element { scale: 18 symbol { name: "drinking-water-l" - priority: 16522 + priority: 16574 } } element { scale: 19 symbol { name: "drinking-water-l" - priority: 16522 + priority: 16574 } caption { primary { @@ -3647,7 +3647,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15522 + priority: 15574 } } } @@ -3657,7 +3657,7 @@ cont { scale: 17 symbol { name: "embassy-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3665,14 +3665,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "embassy-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3680,14 +3680,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "embassy-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -3695,7 +3695,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -3705,7 +3705,7 @@ cont { scale: 15 symbol { name: "fastfood-m" - priority: 16630 + priority: 16693 min_distance: 28 } caption { @@ -3714,14 +3714,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15630 + priority: 15693 } } element { scale: 16 symbol { name: "fastfood-m" - priority: 16630 + priority: 16693 min_distance: 12 } caption { @@ -3730,14 +3730,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15630 + priority: 15693 } } element { scale: 17 symbol { name: "fastfood-l" - priority: 16630 + priority: 16693 min_distance: 12 } caption { @@ -3746,14 +3746,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15630 + priority: 15693 } } element { scale: 18 symbol { name: "fastfood-l" - priority: 16630 + priority: 16693 } caption { primary { @@ -3761,14 +3761,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15630 + priority: 15693 } } element { scale: 19 symbol { name: "fastfood-l" - priority: 16630 + priority: 16693 } caption { primary { @@ -3776,7 +3776,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15630 + priority: 15693 } } } @@ -3787,7 +3787,7 @@ cont { symbol { name: "ship-s" apply_for_type: 1 - priority: 16603 + priority: 16663 min_distance: 12 } } @@ -3796,7 +3796,7 @@ cont { symbol { name: "ship-s" apply_for_type: 1 - priority: 16603 + priority: 16663 min_distance: 12 } } @@ -3805,7 +3805,7 @@ cont { symbol { name: "ship-s" apply_for_type: 1 - priority: 16603 + priority: 16663 } } element { @@ -3813,7 +3813,7 @@ cont { symbol { name: "ship-s" apply_for_type: 1 - priority: 16603 + priority: 16663 } } element { @@ -3821,7 +3821,7 @@ cont { symbol { name: "ship-m" apply_for_type: 1 - priority: 16603 + priority: 16663 } } element { @@ -3829,7 +3829,7 @@ cont { symbol { name: "ship-m" apply_for_type: 1 - priority: 16603 + priority: 16663 } caption { primary { @@ -3838,7 +3838,7 @@ cont { stroke_color: 856756480 offset_y: 8 } - priority: 15603 + priority: 15663 } } element { @@ -3846,7 +3846,7 @@ cont { symbol { name: "ship-l" apply_for_type: 1 - priority: 16603 + priority: 16663 } caption { primary { @@ -3855,7 +3855,7 @@ cont { stroke_color: 1292964096 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { @@ -3863,7 +3863,7 @@ cont { symbol { name: "ship-l" apply_for_type: 1 - priority: 16603 + priority: 16663 } caption { primary { @@ -3872,7 +3872,7 @@ cont { stroke_color: 1292964096 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { @@ -3880,7 +3880,7 @@ cont { symbol { name: "ship-l" apply_for_type: 1 - priority: 16603 + priority: 16663 } caption { primary { @@ -3889,7 +3889,7 @@ cont { stroke_color: 1292964096 offset_y: 10 } - priority: 15603 + priority: 15663 } } } @@ -3899,7 +3899,7 @@ cont { scale: 18 symbol { name: "fire_station-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -3907,14 +3907,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "fire_station-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -3922,7 +3922,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -3932,11 +3932,11 @@ cont { scale: 16 area { color: 8738 - priority: -15487 + priority: -15436 } symbol { name: "fountain-m" - priority: 16513 + priority: 16564 min_distance: 20 } caption { @@ -3945,18 +3945,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15513 + priority: 15564 } } element { scale: 17 area { color: 8738 - priority: -15487 + priority: -15436 } symbol { name: "fountain-l" - priority: 16513 + priority: 16564 min_distance: 24 } caption { @@ -3965,18 +3965,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15513 + priority: 15564 } } element { scale: 18 area { color: 8738 - priority: -15487 + priority: -15436 } symbol { name: "fountain-l" - priority: 16513 + priority: 16564 min_distance: 24 } caption { @@ -3985,18 +3985,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15513 + priority: 15564 } } element { scale: 19 area { color: 8738 - priority: -15487 + priority: -15436 } symbol { name: "fountain-l" - priority: 16513 + priority: 16564 min_distance: 24 } caption { @@ -4005,7 +4005,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15513 + priority: 15564 } } } @@ -4015,7 +4015,7 @@ cont { scale: 14 symbol { name: "fuel-s" - priority: 16585 + priority: 16643 min_distance: 20 } caption { @@ -4031,7 +4031,7 @@ cont { scale: 15 symbol { name: "fuel-m" - priority: 16585 + priority: 16643 min_distance: 20 } caption { @@ -4047,7 +4047,7 @@ cont { scale: 16 symbol { name: "fuel-m" - priority: 16585 + priority: 16643 min_distance: 10 } caption { @@ -4063,7 +4063,7 @@ cont { scale: 17 symbol { name: "fuel-l" - priority: 16585 + priority: 16643 } caption { primary { @@ -4071,14 +4071,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15585 + priority: 15643 } } element { scale: 18 symbol { name: "fuel-l" - priority: 16585 + priority: 16643 } caption { primary { @@ -4086,14 +4086,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15585 + priority: 15643 } } element { scale: 19 symbol { name: "fuel-l" - priority: 16585 + priority: 16643 } caption { primary { @@ -4101,7 +4101,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15585 + priority: 15643 } } } @@ -4111,32 +4111,32 @@ cont { scale: 14 area { color: 655629312 - priority: -15640 + priority: -15604 } } element { scale: 15 area { color: 1317888 - priority: -15640 + priority: -15604 } } element { scale: 16 area { color: 1317888 - priority: -15640 + priority: -15604 } } element { scale: 17 area { color: 1317888 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -4144,18 +4144,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 18 area { color: 1317888 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -4163,18 +4163,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 19 area { color: 1317888 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -4182,7 +4182,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15360 + priority: 15396 } } } @@ -4192,32 +4192,32 @@ cont { scale: 14 area { color: 655629312 - priority: -15640 + priority: -15604 } } element { scale: 15 area { color: 1317888 - priority: -15640 + priority: -15604 } } element { scale: 16 area { color: 1317888 - priority: -15640 + priority: -15604 } } element { scale: 17 area { color: 1317888 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -4225,18 +4225,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 18 area { color: 1317888 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -4244,18 +4244,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 19 area { color: 1317888 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -4263,7 +4263,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15360 + priority: 15396 } } } @@ -4273,11 +4273,11 @@ cont { scale: 14 area { color: 2496790 - priority: -15082 + priority: -15090 } symbol { name: "hospital-s" - priority: 16918 + priority: 16910 min_distance: 8 } } @@ -4285,12 +4285,12 @@ cont { scale: 15 area { color: 2496790 - priority: -15082 + priority: -15090 } symbol { name: "hospital-m" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 6 } caption { @@ -4299,19 +4299,19 @@ cont { color: 5592405 offset_y: 10 } - priority: 15918 + priority: 15910 } } element { scale: 16 area { color: 2496790 - priority: -15082 + priority: -15090 } symbol { name: "hospital-m" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 4 } caption { @@ -4320,19 +4320,19 @@ cont { color: 5592405 offset_y: 10 } - priority: 15918 + priority: 15910 } } element { scale: 17 area { color: 2496790 - priority: -15082 + priority: -15090 } symbol { name: "hospital-l" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 4 } caption { @@ -4341,19 +4341,19 @@ cont { color: 5592405 offset_y: 10 } - priority: 15918 + priority: 15910 } } element { scale: 18 area { color: 2496790 - priority: -15082 + priority: -15090 } symbol { name: "hospital-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -4361,19 +4361,19 @@ cont { color: 5592405 offset_y: 10 } - priority: 15918 + priority: 15910 } } element { scale: 19 area { color: 2496790 - priority: -15082 + priority: -15090 } symbol { name: "hospital-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -4381,7 +4381,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15918 + priority: 15910 } } } @@ -4391,7 +4391,7 @@ cont { scale: 18 symbol { name: "hunting-tower-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -4399,14 +4399,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "hunting-tower-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -4414,7 +4414,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -4424,7 +4424,7 @@ cont { scale: 17 symbol { name: "kindergarten-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -4432,14 +4432,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "kindergarten-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -4447,14 +4447,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "kindergarten-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -4462,7 +4462,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -4473,7 +4473,7 @@ cont { symbol { name: "library-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } caption { primary { @@ -4481,7 +4481,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { @@ -4489,7 +4489,7 @@ cont { symbol { name: "library-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } caption { primary { @@ -4497,7 +4497,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -4507,7 +4507,7 @@ cont { scale: 16 symbol { name: "marketplace-m" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -4516,14 +4516,14 @@ cont { color: 5592405 offset_y: 11 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "marketplace-l" - priority: 16540 + priority: 16594 min_distance: 8 } caption { @@ -4532,14 +4532,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "marketplace-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -4547,14 +4547,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "marketplace-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -4562,7 +4562,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -4572,7 +4572,7 @@ cont { scale: 16 symbol { name: "bar-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -4580,14 +4580,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 17 symbol { name: "bar-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -4595,14 +4595,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 18 symbol { name: "bar-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -4610,14 +4610,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "bar-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -4625,7 +4625,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -4635,18 +4635,18 @@ cont { scale: 15 area { color: 2038555 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-s" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -4654,22 +4654,22 @@ cont { scale: 17 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -4677,18 +4677,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -4696,7 +4696,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -4706,18 +4706,18 @@ cont { scale: 15 area { color: 2038555 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-s" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -4725,22 +4725,22 @@ cont { scale: 17 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -4748,18 +4748,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -4767,7 +4767,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -4777,18 +4777,18 @@ cont { scale: 15 area { color: 2038555 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-s" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -4796,22 +4796,22 @@ cont { scale: 17 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -4819,18 +4819,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -4838,7 +4838,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -4848,18 +4848,18 @@ cont { scale: 15 area { color: 2038555 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-s" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -4867,22 +4867,22 @@ cont { scale: 17 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -4890,18 +4890,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -4909,7 +4909,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -4919,18 +4919,18 @@ cont { scale: 15 area { color: 2038555 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-s" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -4938,22 +4938,22 @@ cont { scale: 17 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -4961,18 +4961,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -4980,7 +4980,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -4990,18 +4990,18 @@ cont { scale: 15 area { color: 2038555 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-s" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -5009,22 +5009,22 @@ cont { scale: 17 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5032,18 +5032,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5051,7 +5051,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -5061,18 +5061,18 @@ cont { scale: 15 area { color: 2038555 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "zero-icon" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -5080,22 +5080,22 @@ cont { scale: 17 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "zero-icon" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5103,18 +5103,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5122,7 +5122,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -5132,18 +5132,18 @@ cont { scale: 15 area { color: 2038555 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "zero-icon" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -5151,22 +5151,22 @@ cont { scale: 17 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "zero-icon" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5174,18 +5174,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5193,7 +5193,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -5203,18 +5203,18 @@ cont { scale: 15 area { color: 2038555 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "zero-icon" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -5222,22 +5222,22 @@ cont { scale: 17 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "zero-icon" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5245,18 +5245,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5264,7 +5264,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -5274,18 +5274,18 @@ cont { scale: 15 area { color: 2038555 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-s" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -5293,22 +5293,22 @@ cont { scale: 17 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5316,18 +5316,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5335,7 +5335,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -5345,18 +5345,18 @@ cont { scale: 15 area { color: 2038555 - priority: -15955 + priority: -15951 } } element { scale: 16 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-s" - priority: 16045 + priority: 16049 min_distance: 25 } } @@ -5364,22 +5364,22 @@ cont { scale: 17 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } } element { scale: 18 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5387,18 +5387,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { scale: 19 area { color: 2038555 - priority: -15955 + priority: -15951 } symbol { name: "parking-m" - priority: 16045 + priority: 16049 } caption { primary { @@ -5406,7 +5406,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -5416,7 +5416,7 @@ cont { scale: 16 symbol { name: "pharmacy-m" - priority: 16918 + priority: 16910 min_distance: 20 } } @@ -5424,7 +5424,7 @@ cont { scale: 17 symbol { name: "pharmacy-l" - priority: 16918 + priority: 16910 min_distance: 20 } caption { @@ -5433,14 +5433,14 @@ cont { color: 5592405 offset_y: 8 } - priority: 15918 + priority: 15910 } } element { scale: 18 symbol { name: "pharmacy-l" - priority: 16918 + priority: 16910 } caption { primary { @@ -5448,14 +5448,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15918 + priority: 15910 } } element { scale: 19 symbol { name: "pharmacy-l" - priority: 16918 + priority: 16910 } caption { primary { @@ -5463,7 +5463,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15918 + priority: 15910 } } } @@ -5473,7 +5473,7 @@ cont { scale: 14 symbol { name: "place-of-worship-s" - priority: 16855 + priority: 16841 min_distance: 12 } caption { @@ -5482,14 +5482,14 @@ cont { color: 5592405 offset_y: 6 } - priority: 15855 + priority: 15841 } } element { scale: 15 symbol { name: "place-of-worship-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5498,18 +5498,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 16 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "place-of-worship-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5518,18 +5518,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 17 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "place-of-worship-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5537,18 +5537,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 18 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "place-of-worship-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5556,18 +5556,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 19 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "place-of-worship-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5575,7 +5575,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } } @@ -5585,7 +5585,7 @@ cont { scale: 14 symbol { name: "buddhist-s" - priority: 16855 + priority: 16841 min_distance: 12 } caption { @@ -5594,14 +5594,14 @@ cont { color: 5592405 offset_y: 6 } - priority: 15855 + priority: 15841 } } element { scale: 15 symbol { name: "buddhist-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5610,18 +5610,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 16 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "buddhist-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5630,18 +5630,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 17 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "buddhist-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5649,18 +5649,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 18 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "buddhist-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5668,18 +5668,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 19 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "buddhist-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5687,7 +5687,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } } @@ -5697,7 +5697,7 @@ cont { scale: 14 symbol { name: "christian-s" - priority: 16855 + priority: 16841 min_distance: 12 } caption { @@ -5706,14 +5706,14 @@ cont { color: 5592405 offset_y: 6 } - priority: 15855 + priority: 15841 } } element { scale: 15 symbol { name: "christian-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5722,18 +5722,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 16 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "christian-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5742,18 +5742,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 17 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "christian-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5761,18 +5761,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 18 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "christian-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5780,18 +5780,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 19 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "christian-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5799,7 +5799,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } } @@ -5809,7 +5809,7 @@ cont { scale: 14 symbol { name: "hindu-s" - priority: 16855 + priority: 16841 min_distance: 12 } caption { @@ -5818,14 +5818,14 @@ cont { color: 5592405 offset_y: 6 } - priority: 15855 + priority: 15841 } } element { scale: 15 symbol { name: "hindu-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5834,18 +5834,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 16 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "hindu-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5854,18 +5854,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 17 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "hindu-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5873,18 +5873,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 18 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "hindu-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5892,18 +5892,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 19 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "hindu-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5911,7 +5911,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } } @@ -5921,7 +5921,7 @@ cont { scale: 14 symbol { name: "jewish-s" - priority: 16855 + priority: 16841 min_distance: 12 } caption { @@ -5930,14 +5930,14 @@ cont { color: 5592405 offset_y: 6 } - priority: 15855 + priority: 15841 } } element { scale: 15 symbol { name: "jewish-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5946,18 +5946,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 16 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "jewish-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -5966,18 +5966,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 17 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "jewish-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -5985,18 +5985,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 18 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "jewish-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6004,18 +6004,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 19 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "jewish-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6023,7 +6023,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } } @@ -6033,7 +6033,7 @@ cont { scale: 14 symbol { name: "muslim-s" - priority: 16855 + priority: 16841 min_distance: 12 } caption { @@ -6042,14 +6042,14 @@ cont { color: 5592405 offset_y: 6 } - priority: 15855 + priority: 15841 } } element { scale: 15 symbol { name: "muslim-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -6058,18 +6058,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 16 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "muslim-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -6078,18 +6078,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 17 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "muslim-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6097,18 +6097,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 18 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "muslim-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6116,18 +6116,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 19 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "muslim-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6135,7 +6135,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } } @@ -6145,7 +6145,7 @@ cont { scale: 14 symbol { name: "shinto-s" - priority: 16855 + priority: 16841 min_distance: 12 } caption { @@ -6154,14 +6154,14 @@ cont { color: 5592405 offset_y: 6 } - priority: 15855 + priority: 15841 } } element { scale: 15 symbol { name: "shinto-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -6170,18 +6170,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 16 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "shinto-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -6190,18 +6190,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 17 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "shinto-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6209,18 +6209,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 18 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "shinto-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6228,18 +6228,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 19 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "shinto-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6247,7 +6247,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } } @@ -6257,7 +6257,7 @@ cont { scale: 14 symbol { name: "taoist-s" - priority: 16855 + priority: 16841 min_distance: 12 } caption { @@ -6266,14 +6266,14 @@ cont { color: 5592405 offset_y: 6 } - priority: 15855 + priority: 15841 } } element { scale: 15 symbol { name: "taoist-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -6282,18 +6282,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 16 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "taoist-m" - priority: 16855 + priority: 16841 min_distance: 10 } caption { @@ -6302,18 +6302,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 17 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "taoist-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6321,18 +6321,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 18 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "taoist-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6340,18 +6340,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 19 area { color: 2499106 - priority: -15145 + priority: -15159 } symbol { name: "taoist-l" - priority: 16855 + priority: 16841 } caption { primary { @@ -6359,7 +6359,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } } @@ -6369,7 +6369,7 @@ cont { scale: 17 symbol { name: "police-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -6377,14 +6377,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "police-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -6392,14 +6392,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "police-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -6407,7 +6407,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -6417,7 +6417,7 @@ cont { scale: 18 symbol { name: "postbox-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -6425,14 +6425,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "postbox-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -6440,7 +6440,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -6451,7 +6451,7 @@ cont { symbol { name: "mail-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -6459,7 +6459,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -6467,7 +6467,7 @@ cont { symbol { name: "mail-m" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -6475,7 +6475,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -6483,7 +6483,7 @@ cont { symbol { name: "mail-m" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -6491,7 +6491,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -6501,7 +6501,7 @@ cont { scale: 15 symbol { name: "beer-m" - priority: 16612 + priority: 16673 min_distance: 28 } caption { @@ -6510,14 +6510,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15612 + priority: 15673 } } element { scale: 16 symbol { name: "beer-m" - priority: 16612 + priority: 16673 min_distance: 12 } caption { @@ -6526,14 +6526,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15612 + priority: 15673 } } element { scale: 17 symbol { name: "beer-l" - priority: 16612 + priority: 16673 min_distance: 12 } caption { @@ -6542,14 +6542,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15612 + priority: 15673 } } element { scale: 18 symbol { name: "beer-l" - priority: 16612 + priority: 16673 } caption { primary { @@ -6557,14 +6557,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15612 + priority: 15673 } } element { scale: 19 symbol { name: "beer-l" - priority: 16612 + priority: 16673 } caption { primary { @@ -6572,7 +6572,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15612 + priority: 15673 } } } @@ -6596,7 +6596,7 @@ cont { scale: 17 symbol { name: "recycling-l" - priority: 16531 + priority: 16584 min_distance: 30 } } @@ -6604,7 +6604,7 @@ cont { scale: 18 symbol { name: "recycling-l" - priority: 16531 + priority: 16584 min_distance: 30 } } @@ -6612,7 +6612,7 @@ cont { scale: 19 symbol { name: "recycling-l" - priority: 16531 + priority: 16584 min_distance: 30 } caption { @@ -6621,7 +6621,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -6631,7 +6631,7 @@ cont { scale: 15 symbol { name: "restaurant-m" - priority: 16639 + priority: 16702 min_distance: 28 } caption { @@ -6640,14 +6640,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15639 + priority: 15702 } } element { scale: 16 symbol { name: "restaurant-m" - priority: 16639 + priority: 16702 min_distance: 12 } caption { @@ -6656,14 +6656,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15639 + priority: 15702 } } element { scale: 17 symbol { name: "restaurant-l" - priority: 16639 + priority: 16702 min_distance: 12 } caption { @@ -6672,14 +6672,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15639 + priority: 15702 } } element { scale: 18 symbol { name: "restaurant-l" - priority: 16639 + priority: 16702 } caption { primary { @@ -6687,14 +6687,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15639 + priority: 15702 } } element { scale: 19 symbol { name: "restaurant-l" - priority: 16639 + priority: 16702 } caption { primary { @@ -6702,7 +6702,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15639 + priority: 15702 } } } @@ -6712,7 +6712,7 @@ cont { scale: 17 symbol { name: "school-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -6720,14 +6720,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 18 symbol { name: "school-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -6735,14 +6735,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "school-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -6750,7 +6750,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -6760,7 +6760,7 @@ cont { scale: 16 symbol { name: "picnic-m" - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -6769,14 +6769,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 17 symbol { name: "picnic-l" - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -6785,14 +6785,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 18 symbol { name: "picnic-l" - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -6801,14 +6801,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "picnic-l" - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -6817,7 +6817,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -6841,7 +6841,7 @@ cont { scale: 16 symbol { name: "taxi-m" - priority: 16540 + priority: 16594 min_distance: 30 } caption { @@ -6850,14 +6850,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "taxi-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -6866,14 +6866,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "taxi-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -6881,14 +6881,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "taxi-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -6896,7 +6896,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -6907,7 +6907,7 @@ cont { symbol { name: "phone-l" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 30 } } @@ -6916,7 +6916,7 @@ cont { symbol { name: "phone-l" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 30 } } @@ -6925,7 +6925,7 @@ cont { symbol { name: "phone-l" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 30 } caption { @@ -6934,7 +6934,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -6944,7 +6944,7 @@ cont { scale: 14 symbol { name: "theatre-s" - priority: 16648 + priority: 16712 min_distance: 8 } caption { @@ -6953,7 +6953,7 @@ cont { color: 5592405 offset_y: 6 } - priority: 15648 + priority: 15712 } } element { @@ -6964,14 +6964,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15648 + priority: 15712 } } element { scale: 16 symbol { name: "theatre-m" - priority: 16648 + priority: 16712 min_distance: 10 } caption { @@ -6980,14 +6980,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15648 + priority: 15712 } } element { scale: 17 symbol { name: "theatre-l" - priority: 16648 + priority: 16712 } caption { primary { @@ -6995,14 +6995,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15648 + priority: 15712 } } element { scale: 18 symbol { name: "theatre-l" - priority: 16648 + priority: 16712 } caption { primary { @@ -7010,14 +7010,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15648 + priority: 15712 } } element { scale: 19 symbol { name: "theatre-l" - priority: 16648 + priority: 16712 } caption { primary { @@ -7025,7 +7025,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15648 + priority: 15712 } } } @@ -7035,7 +7035,7 @@ cont { scale: 18 symbol { name: "toilets-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -7043,14 +7043,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "toilets-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -7058,7 +7058,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -7289,7 +7289,7 @@ cont { scale: 17 symbol { name: "vending-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7298,14 +7298,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "vending-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7314,14 +7314,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "vending-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7330,7 +7330,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -7340,7 +7340,7 @@ cont { scale: 17 symbol { name: "vending-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7349,14 +7349,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "vending-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7365,14 +7365,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "vending-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7381,7 +7381,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -7391,7 +7391,7 @@ cont { scale: 17 symbol { name: "parking-meter-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7400,14 +7400,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "parking-meter-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7416,14 +7416,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "parking-meter-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7432,7 +7432,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -7442,7 +7442,7 @@ cont { scale: 17 symbol { name: "vending-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7451,14 +7451,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "vending-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7467,14 +7467,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "vending-l" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -7483,7 +7483,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -7493,7 +7493,7 @@ cont { scale: 16 symbol { name: "veterinary-m" - priority: 16540 + priority: 16594 } caption { primary { @@ -7501,14 +7501,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "veterinary-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -7516,14 +7516,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "veterinary-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -7531,14 +7531,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "veterinary-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -7546,7 +7546,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -7557,7 +7557,7 @@ cont { symbol { name: "waste-basket-s" apply_for_type: 1 - priority: 16522 + priority: 16574 } } element { @@ -7565,7 +7565,7 @@ cont { symbol { name: "waste-basket-s" apply_for_type: 1 - priority: 16522 + priority: 16574 } caption { primary { @@ -7573,7 +7573,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15522 + priority: 15574 } } } @@ -7583,7 +7583,7 @@ cont { scale: 18 symbol { name: "recycling-l" - priority: 16522 + priority: 16574 } caption { primary { @@ -7591,14 +7591,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15522 + priority: 15574 } } element { scale: 19 symbol { name: "recycling-l" - priority: 16522 + priority: 16574 } caption { primary { @@ -7606,7 +7606,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15522 + priority: 15574 } } } @@ -7616,77 +7616,77 @@ cont { scale: 14 area { color: 2499106 - priority: -15883 + priority: -15872 } } element { scale: 15 area { color: 2499106 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 10066329 } - priority: 15117 + priority: 15128 } } element { scale: 16 area { color: 2499106 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 10066329 } - priority: 15117 + priority: 15128 } } element { scale: 17 area { color: 2499106 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 10066329 } - priority: 15117 + priority: 15128 } } element { scale: 18 area { color: 2499106 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 10066329 } - priority: 15117 + priority: 15128 } } element { scale: 19 area { color: 2499106 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 10066329 } - priority: 15117 + priority: 15128 } } } @@ -7696,42 +7696,42 @@ cont { scale: 14 area { color: 2499106 - priority: -15883 + priority: -15872 } } element { scale: 15 area { color: 2499106 - priority: -15883 + priority: -15872 } } element { scale: 16 area { color: 2499106 - priority: -15883 + priority: -15872 } } element { scale: 17 area { color: 2499106 - priority: -15883 + priority: -15872 } } element { scale: 18 area { color: 2499106 - priority: -15883 + priority: -15872 } } element { scale: 19 area { color: 2499106 - priority: -15883 + priority: -15872 } } } @@ -7741,77 +7741,77 @@ cont { scale: 14 area { color: 2499106 - priority: -15883 + priority: -15872 } } element { scale: 15 area { color: 2499106 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 10066329 } - priority: 15117 + priority: 15128 } } element { scale: 16 area { color: 2499106 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 10066329 } - priority: 15117 + priority: 15128 } } element { scale: 17 area { color: 2499106 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 10066329 } - priority: 15117 + priority: 15128 } } element { scale: 18 area { color: 2499106 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 10066329 } - priority: 15117 + priority: 15128 } } element { scale: 19 area { color: 2499106 - priority: -15883 + priority: -15872 } caption { primary { height: 11 color: 10066329 } - priority: 15117 + priority: 15128 } } } @@ -7948,7 +7948,7 @@ cont { symbol { name: "bcontrol-m" apply_for_type: 1 - priority: 16603 + priority: 16663 } caption { primary { @@ -7956,7 +7956,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { @@ -7964,7 +7964,7 @@ cont { symbol { name: "bcontrol-m" apply_for_type: 1 - priority: 16603 + priority: 16663 } caption { primary { @@ -7972,7 +7972,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { @@ -7980,7 +7980,7 @@ cont { symbol { name: "bcontrol-l" apply_for_type: 1 - priority: 16603 + priority: 16663 } caption { primary { @@ -7988,7 +7988,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { @@ -7996,7 +7996,7 @@ cont { symbol { name: "bcontrol-l" apply_for_type: 1 - priority: 16603 + priority: 16663 } caption { primary { @@ -8004,7 +8004,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { @@ -8012,7 +8012,7 @@ cont { symbol { name: "bcontrol-l" apply_for_type: 1 - priority: 16603 + priority: 16663 } caption { primary { @@ -8020,7 +8020,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15603 + priority: 15663 } } } @@ -8035,7 +8035,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8049,7 +8049,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8063,7 +8063,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8077,7 +8077,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8157,7 +8157,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8171,7 +8171,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8185,7 +8185,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8199,7 +8199,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8279,7 +8279,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8293,7 +8293,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8307,7 +8307,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8321,7 +8321,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8333,7 +8333,7 @@ cont { scale: 16 symbol { name: "lift_gate-m" - priority: 16540 + priority: 16594 min_distance: 30 } caption { @@ -8342,14 +8342,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "lift_gate-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -8358,14 +8358,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "lift_gate-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -8374,14 +8374,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "lift_gate-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -8390,7 +8390,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -8405,7 +8405,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8419,7 +8419,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8433,7 +8433,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8447,7 +8447,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8522,7 +8522,7 @@ cont { scale: 12 symbol { name: "toll_booth-s" - priority: 16927 + priority: 16920 min_distance: 8 } } @@ -8530,7 +8530,7 @@ cont { scale: 13 symbol { name: "toll_booth-s" - priority: 16927 + priority: 16920 min_distance: 8 } } @@ -8538,7 +8538,7 @@ cont { scale: 14 symbol { name: "toll_booth-s" - priority: 16927 + priority: 16920 min_distance: 8 } caption { @@ -8547,14 +8547,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15927 + priority: 15920 } } element { scale: 15 symbol { name: "toll_booth-m" - priority: 16927 + priority: 16920 min_distance: 8 } caption { @@ -8563,14 +8563,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15927 + priority: 15920 } } element { scale: 16 symbol { name: "toll_booth-m" - priority: 16927 + priority: 16920 min_distance: 8 } caption { @@ -8579,14 +8579,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15927 + priority: 15920 } } element { scale: 17 symbol { name: "toll_booth-m" - priority: 16927 + priority: 16920 min_distance: 8 } caption { @@ -8595,14 +8595,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15927 + priority: 15920 } } element { scale: 18 symbol { name: "toll_booth-m" - priority: 16927 + priority: 16920 min_distance: 8 } caption { @@ -8611,14 +8611,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15927 + priority: 15920 } } element { scale: 19 symbol { name: "toll_booth-m" - priority: 16927 + priority: 16920 min_distance: 8 } caption { @@ -8627,7 +8627,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15927 + priority: 15920 } } } @@ -8642,7 +8642,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8656,7 +8656,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8670,7 +8670,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8684,7 +8684,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -8697,7 +8697,7 @@ cont { lines { width: 0.5 color: 1297438037 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8707,7 +8707,7 @@ cont { lines { width: 0.5 color: 861230421 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8717,7 +8717,7 @@ cont { lines { width: 0.6 color: 5592405 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8727,7 +8727,7 @@ cont { lines { width: 0.8 color: 5592405 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8737,7 +8737,7 @@ cont { lines { width: 0.85 color: 5592405 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8747,7 +8747,7 @@ cont { lines { width: 1.0 color: 5592405 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8757,7 +8757,7 @@ cont { lines { width: 1.1 color: 5592405 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8767,7 +8767,7 @@ cont { lines { width: 1.4 color: 5592405 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8777,7 +8777,7 @@ cont { lines { width: 1.4 color: 5592405 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8787,7 +8787,7 @@ cont { lines { width: 1.4 color: 5592405 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8797,7 +8797,7 @@ cont { lines { width: 1.4 color: 5592405 - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8807,7 +8807,7 @@ cont { lines { width: 1.4 color: 5592405 - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: BUTTCAP } @@ -8817,7 +8817,7 @@ cont { lines { width: 1.4 color: 5592405 - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: BUTTCAP } @@ -8827,7 +8827,7 @@ cont { lines { width: 1.4 color: 5592405 - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: BUTTCAP } @@ -8837,7 +8837,7 @@ cont { lines { width: 1.4 color: 5592405 - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -8847,7 +8847,7 @@ cont { lines { width: 1.4 color: 5592405 - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -8857,7 +8857,7 @@ cont { lines { width: 1.4 color: 5592405 - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -8867,7 +8867,7 @@ cont { lines { width: 1.4 color: 5592405 - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -8884,7 +8884,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8901,7 +8901,7 @@ cont { dd: 1.35 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8915,7 +8915,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8929,7 +8929,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8943,7 +8943,7 @@ cont { dd: 1.44 dd: 1.44 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8957,7 +8957,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8971,7 +8971,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8985,7 +8985,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -8999,7 +8999,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9013,7 +9013,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: BUTTCAP } @@ -9027,7 +9027,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: BUTTCAP } @@ -9041,7 +9041,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: BUTTCAP } @@ -9055,7 +9055,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -9069,7 +9069,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -9083,7 +9083,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -9097,7 +9097,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -9114,7 +9114,7 @@ cont { dd: 1.35 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9128,7 +9128,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9142,7 +9142,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9156,7 +9156,7 @@ cont { dd: 1.44 dd: 1.44 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9170,7 +9170,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9184,7 +9184,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9198,7 +9198,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9212,7 +9212,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: BEVELJOIN cap: BUTTCAP } @@ -9226,7 +9226,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: BUTTCAP } @@ -9240,7 +9240,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: BUTTCAP } @@ -9254,7 +9254,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: BUTTCAP } @@ -9268,7 +9268,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -9282,7 +9282,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -9296,7 +9296,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -9310,7 +9310,7 @@ cont { dd: 1.8 dd: 1.0 } - priority: 1180 + priority: 1198 join: ROUNDJOIN cap: ROUNDCAP } @@ -9322,7 +9322,7 @@ cont { scale: 11 symbol { name: "nparkf-s" - priority: 16603 + priority: 16663 min_distance: 20 } } @@ -9330,7 +9330,7 @@ cont { scale: 12 symbol { name: "nparkf-s" - priority: 16603 + priority: 16663 min_distance: 12 } caption { @@ -9340,14 +9340,14 @@ cont { stroke_color: 856756480 offset_y: 6 } - priority: 15603 + priority: 15663 } } element { scale: 13 symbol { name: "nparkf-s" - priority: 16603 + priority: 16663 min_distance: 12 } caption { @@ -9357,18 +9357,18 @@ cont { stroke_color: 856756480 offset_y: 6 } - priority: 15603 + priority: 15663 } } element { scale: 14 area { color: 1844736 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-s" - priority: 16603 + priority: 16663 } caption { primary { @@ -9377,18 +9377,18 @@ cont { stroke_color: 856756480 offset_y: 8 } - priority: 15603 + priority: 15663 } } element { scale: 15 area { color: 1844736 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-m" - priority: 16603 + priority: 16663 } caption { primary { @@ -9397,18 +9397,18 @@ cont { stroke_color: 437326080 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 16 area { color: 1844736 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-m" - priority: 16603 + priority: 16663 } caption { primary { @@ -9417,18 +9417,18 @@ cont { stroke_color: 437326080 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 17 area { color: 1844736 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -9437,18 +9437,18 @@ cont { stroke_color: 437326080 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 18 area { color: 1844736 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -9457,18 +9457,18 @@ cont { stroke_color: 437326080 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 19 area { color: 1844736 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -9477,7 +9477,7 @@ cont { stroke_color: 437326080 offset_y: 10 } - priority: 15603 + priority: 15663 } } } @@ -9487,14 +9487,14 @@ cont { scale: 14 area { color: 2149720610 - priority: 1235 + priority: 1258 } } element { scale: 15 area { color: 1713512994 - priority: 1235 + priority: 1258 } } element { @@ -9505,7 +9505,7 @@ cont { width: 1.0 color: 3158064 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9518,7 +9518,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9529,7 +9529,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9542,7 +9542,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9553,7 +9553,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9566,7 +9566,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9577,7 +9577,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9590,7 +9590,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } } @@ -9609,7 +9609,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9625,7 +9625,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9641,7 +9641,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9657,7 +9657,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } } @@ -9667,14 +9667,14 @@ cont { scale: 14 area { color: 2149720610 - priority: 1235 + priority: 1258 } } element { scale: 15 area { color: 1713512994 - priority: 1235 + priority: 1258 } } element { @@ -9685,7 +9685,7 @@ cont { width: 1.0 color: 3158064 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9698,7 +9698,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9709,7 +9709,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9722,7 +9722,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9733,7 +9733,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9746,7 +9746,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9757,7 +9757,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9770,7 +9770,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } } @@ -9780,14 +9780,14 @@ cont { scale: 14 area { color: 2149720610 - priority: 1235 + priority: 1258 } } element { scale: 15 area { color: 1713512994 - priority: 1235 + priority: 1258 } } element { @@ -9798,7 +9798,7 @@ cont { width: 1.0 color: 3158064 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9811,7 +9811,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9822,7 +9822,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9835,7 +9835,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9846,7 +9846,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9859,7 +9859,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9870,7 +9870,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1235 + priority: 1258 } caption { primary { @@ -9883,7 +9883,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } } @@ -9893,29 +9893,29 @@ cont { scale: 13 symbol { name: "train-s" - priority: 16657 + priority: 16722 } } element { scale: 14 area { color: 2149720610 - priority: 1658 + priority: 1723 } symbol { name: "train-s" - priority: 16657 + priority: 16722 } } element { scale: 15 area { color: 1713512994 - priority: 1658 + priority: 1723 } symbol { name: "train-m" - priority: 16657 + priority: 16722 } } element { @@ -9926,11 +9926,11 @@ cont { width: 1.0 color: 3158064 } - priority: 1235 + priority: 1258 } symbol { name: "train-m" - priority: 16234 + priority: 16257 } caption { primary { @@ -9944,7 +9944,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9955,11 +9955,11 @@ cont { width: 1.0 color: 4671303 } - priority: 1235 + priority: 1258 } symbol { name: "train-l" - priority: 16234 + priority: 16257 } caption { primary { @@ -9973,7 +9973,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -9984,11 +9984,11 @@ cont { width: 1.0 color: 4671303 } - priority: 1235 + priority: 1258 } symbol { name: "train-l" - priority: 16234 + priority: 16257 } caption { primary { @@ -10002,7 +10002,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } element { @@ -10013,11 +10013,11 @@ cont { width: 1.0 color: 4671303 } - priority: 1235 + priority: 1258 } symbol { name: "train-l" - priority: 16234 + priority: 16257 } caption { primary { @@ -10031,7 +10031,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15234 + priority: 15257 } } } @@ -10045,7 +10045,7 @@ cont { width: 1.0 color: 3158064 } - priority: 1199 + priority: 1218 } } element { @@ -10056,7 +10056,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1199 + priority: 1218 } } element { @@ -10067,7 +10067,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1199 + priority: 1218 } } element { @@ -10078,7 +10078,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1199 + priority: 1218 } } } @@ -10088,7 +10088,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10096,14 +10096,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10111,7 +10111,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10121,7 +10121,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10129,14 +10129,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10144,7 +10144,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10154,7 +10154,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10162,14 +10162,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10177,7 +10177,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10187,7 +10187,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10195,14 +10195,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10210,7 +10210,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10220,7 +10220,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10228,14 +10228,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10243,7 +10243,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10253,7 +10253,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10261,14 +10261,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10276,7 +10276,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10286,7 +10286,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10294,14 +10294,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10309,7 +10309,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10319,7 +10319,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10327,14 +10327,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10342,7 +10342,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10352,7 +10352,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10360,14 +10360,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10375,7 +10375,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10385,7 +10385,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10393,14 +10393,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10408,7 +10408,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10418,7 +10418,7 @@ cont { scale: 18 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10426,14 +10426,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hand-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -10441,7 +10441,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -10452,7 +10452,7 @@ cont { symbol { name: "phone-l" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 30 } } @@ -10461,7 +10461,7 @@ cont { symbol { name: "phone-l" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 30 } } @@ -10470,7 +10470,7 @@ cont { symbol { name: "phone-l" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 30 } } @@ -10482,7 +10482,7 @@ cont { symbol { name: "entrance-s" apply_for_type: 1 - priority: 16054 + priority: 16059 } caption { primary { @@ -10491,7 +10491,7 @@ cont { offset_x: 10 text: "ref" } - priority: 15054 + priority: 15059 } } element { @@ -10499,7 +10499,7 @@ cont { symbol { name: "entrance-s" apply_for_type: 1 - priority: 16054 + priority: 16059 } caption { primary { @@ -10514,7 +10514,7 @@ cont { offset_y: 10 text: "addr:flats" } - priority: 15054 + priority: 15059 } } } @@ -10529,7 +10529,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: BUTTCAP } @@ -10543,7 +10543,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: BUTTCAP } @@ -10553,7 +10553,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16270 + priority: 16297 } } element { @@ -10565,7 +10565,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10575,7 +10575,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16270 + priority: 16297 } } element { @@ -10587,7 +10587,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10597,7 +10597,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16270 + priority: 16297 } } element { @@ -10609,7 +10609,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10619,7 +10619,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16270 + priority: 16297 } } element { @@ -10631,7 +10631,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10641,7 +10641,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16270 + priority: 16297 } } } @@ -10656,7 +10656,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: BUTTCAP } @@ -10670,7 +10670,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: BUTTCAP } @@ -10680,7 +10680,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16270 + priority: 16297 } } element { @@ -10692,7 +10692,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10702,7 +10702,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16270 + priority: 16297 } } element { @@ -10714,7 +10714,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10724,7 +10724,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16270 + priority: 16297 } } element { @@ -10736,7 +10736,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10746,7 +10746,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16270 + priority: 16297 } } element { @@ -10758,7 +10758,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10768,7 +10768,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16270 + priority: 16297 } } } @@ -10783,7 +10783,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: BUTTCAP } @@ -10797,7 +10797,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: BUTTCAP } @@ -10807,7 +10807,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16270 + priority: 16297 } } element { @@ -10819,7 +10819,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10829,7 +10829,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16270 + priority: 16297 } } element { @@ -10841,7 +10841,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10851,7 +10851,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16270 + priority: 16297 } } element { @@ -10863,7 +10863,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10873,7 +10873,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16270 + priority: 16297 } } element { @@ -10885,7 +10885,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10895,7 +10895,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16270 + priority: 16297 } } } @@ -10910,7 +10910,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: BUTTCAP } @@ -10924,7 +10924,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: BUTTCAP } @@ -10934,7 +10934,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16270 + priority: 16297 } } element { @@ -10946,7 +10946,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10956,7 +10956,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16270 + priority: 16297 } } element { @@ -10968,7 +10968,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -10978,7 +10978,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16270 + priority: 16297 } } element { @@ -10990,7 +10990,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -11000,7 +11000,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16270 + priority: 16297 } } element { @@ -11012,7 +11012,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1270 + priority: 1297 join: ROUNDJOIN cap: ROUNDCAP } @@ -11022,7 +11022,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16270 + priority: 16297 } } } @@ -11032,14 +11032,14 @@ cont { scale: 16 symbol { name: "bus-m" - priority: 16945 + priority: 16940 } } element { scale: 17 symbol { name: "bus-l" - priority: 16945 + priority: 16940 } caption { primary { @@ -11055,14 +11055,14 @@ cont { offset_y: 20 text: "int_name" } - priority: 15945 + priority: 15940 } } element { scale: 18 symbol { name: "bus-l" - priority: 16945 + priority: 16940 } caption { primary { @@ -11078,14 +11078,14 @@ cont { offset_y: 10 text: "int_name" } - priority: 15945 + priority: 15940 } } element { scale: 19 symbol { name: "bus-l" - priority: 16945 + priority: 16940 } caption { primary { @@ -11101,7 +11101,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15945 + priority: 15940 } } } @@ -11116,7 +11116,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: BUTTCAP } @@ -11130,7 +11130,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: BUTTCAP } @@ -11144,7 +11144,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: BUTTCAP } @@ -11154,7 +11154,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16261 + priority: 16287 } } element { @@ -11166,7 +11166,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -11176,7 +11176,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16261 + priority: 16287 } } element { @@ -11188,7 +11188,7 @@ cont { dd: 10.8 dd: 4.5 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -11198,7 +11198,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16261 + priority: 16287 } } element { @@ -11210,7 +11210,7 @@ cont { dd: 13.5 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -11220,7 +11220,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16261 + priority: 16287 } } element { @@ -11232,7 +11232,7 @@ cont { dd: 18.0 dd: 6.2 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -11242,7 +11242,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16261 + priority: 16287 } } } @@ -11253,7 +11253,7 @@ cont { lines { width: 1.0 color: 7224647 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11263,7 +11263,7 @@ cont { lines { width: 1.2 color: 7224647 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11273,7 +11273,7 @@ cont { lines { width: 1.4 color: 7224647 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11283,7 +11283,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } element { @@ -11291,7 +11291,7 @@ cont { lines { width: 1.6 color: 7224647 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11301,7 +11301,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } element { @@ -11309,7 +11309,7 @@ cont { lines { width: 1.8 color: 7224647 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11319,7 +11319,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } element { @@ -11327,7 +11327,7 @@ cont { lines { width: 2.0 color: 7224647 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11337,7 +11337,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } element { @@ -11345,7 +11345,7 @@ cont { lines { width: 2.2 color: 7224647 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11355,7 +11355,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } } @@ -11366,7 +11366,7 @@ cont { lines { width: 1.0 color: 7224647 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11376,7 +11376,7 @@ cont { lines { width: 1.2 color: 7224647 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11386,7 +11386,7 @@ cont { lines { width: 1.4 color: 7224647 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11396,7 +11396,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } element { @@ -11404,7 +11404,7 @@ cont { lines { width: 1.6 color: 7224647 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11414,7 +11414,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } element { @@ -11422,7 +11422,7 @@ cont { lines { width: 1.8 color: 7224647 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11432,7 +11432,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } element { @@ -11440,7 +11440,7 @@ cont { lines { width: 2.0 color: 7224647 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11450,7 +11450,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } element { @@ -11458,7 +11458,7 @@ cont { lines { width: 2.2 color: 7224647 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11468,7 +11468,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } } @@ -11479,7 +11479,7 @@ cont { lines { width: 1.0 color: 7224647 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11489,7 +11489,7 @@ cont { lines { width: 1.2 color: 7224647 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11499,7 +11499,7 @@ cont { lines { width: 1.4 color: 7224647 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11509,7 +11509,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } element { @@ -11517,7 +11517,7 @@ cont { lines { width: 1.6 color: 7224647 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11527,7 +11527,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } element { @@ -11535,7 +11535,7 @@ cont { lines { width: 1.8 color: 7224647 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11545,7 +11545,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } element { @@ -11553,7 +11553,7 @@ cont { lines { width: 2.0 color: 7224647 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11563,7 +11563,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } element { @@ -11571,7 +11571,7 @@ cont { lines { width: 2.2 color: 7224647 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11581,7 +11581,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } } @@ -11592,7 +11592,7 @@ cont { lines { width: 1.0 color: 7224647 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11602,7 +11602,7 @@ cont { lines { width: 1.2 color: 7224647 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11612,7 +11612,7 @@ cont { lines { width: 1.4 color: 7224647 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -11622,7 +11622,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } element { @@ -11630,7 +11630,7 @@ cont { lines { width: 1.6 color: 7224647 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11640,7 +11640,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } element { @@ -11648,7 +11648,7 @@ cont { lines { width: 1.8 color: 7224647 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11658,7 +11658,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } element { @@ -11666,7 +11666,7 @@ cont { lines { width: 2.0 color: 7224647 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11676,7 +11676,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } element { @@ -11684,7 +11684,7 @@ cont { lines { width: 2.2 color: 7224647 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -11694,7 +11694,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } } @@ -11709,7 +11709,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -11723,7 +11723,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -11733,7 +11733,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -11745,7 +11745,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -11755,7 +11755,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -11767,7 +11767,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -11777,7 +11777,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -11789,7 +11789,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -11799,7 +11799,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -11811,7 +11811,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -11821,7 +11821,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -11836,7 +11836,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -11850,7 +11850,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -11860,7 +11860,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -11872,7 +11872,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -11882,7 +11882,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -11894,7 +11894,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -11904,7 +11904,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -11916,7 +11916,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -11926,7 +11926,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -11938,7 +11938,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -11948,7 +11948,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -11963,13 +11963,13 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } area { color: 2499106 - priority: -15721 + priority: -15694 } } element { @@ -11981,13 +11981,13 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } area { color: 2499106 - priority: -15721 + priority: -15694 } path_text { primary { @@ -11995,7 +11995,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12007,13 +12007,13 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } area { color: 2499106 - priority: -15721 + priority: -15694 } path_text { primary { @@ -12021,7 +12021,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12033,13 +12033,13 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } area { color: 2499106 - priority: -15721 + priority: -15694 } path_text { primary { @@ -12047,7 +12047,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12059,13 +12059,13 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } area { color: 2499106 - priority: -15721 + priority: -15694 } path_text { primary { @@ -12073,7 +12073,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12085,13 +12085,13 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } area { color: 2499106 - priority: -15721 + priority: -15694 } path_text { primary { @@ -12099,7 +12099,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -12114,7 +12114,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12128,7 +12128,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12138,7 +12138,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12150,7 +12150,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12160,7 +12160,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12172,7 +12172,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12182,7 +12182,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12194,7 +12194,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12204,7 +12204,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12216,7 +12216,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12226,7 +12226,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -12241,7 +12241,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12255,7 +12255,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12265,7 +12265,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12277,7 +12277,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12287,7 +12287,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12299,7 +12299,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12309,7 +12309,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12321,7 +12321,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12331,7 +12331,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12343,7 +12343,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12353,7 +12353,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -12368,7 +12368,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12382,7 +12382,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12392,7 +12392,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12404,7 +12404,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12414,7 +12414,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12426,7 +12426,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12436,7 +12436,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12448,7 +12448,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12458,7 +12458,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12470,7 +12470,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12480,7 +12480,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -12495,7 +12495,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12509,7 +12509,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12519,7 +12519,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12531,7 +12531,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12541,7 +12541,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12553,7 +12553,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12563,7 +12563,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12575,7 +12575,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12585,7 +12585,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12597,7 +12597,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12607,7 +12607,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -12622,7 +12622,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12636,7 +12636,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12646,7 +12646,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12658,7 +12658,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12668,7 +12668,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12680,7 +12680,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12690,7 +12690,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12702,7 +12702,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12712,7 +12712,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12724,7 +12724,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12734,7 +12734,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -12749,7 +12749,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12763,7 +12763,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12773,7 +12773,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12785,7 +12785,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12795,7 +12795,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12807,7 +12807,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12817,7 +12817,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12829,7 +12829,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12839,7 +12839,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12851,7 +12851,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12861,7 +12861,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -12876,7 +12876,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12890,7 +12890,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -12900,7 +12900,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12912,7 +12912,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12922,7 +12922,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12934,7 +12934,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12944,7 +12944,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12956,7 +12956,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12966,7 +12966,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -12978,7 +12978,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -12988,7 +12988,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -13003,7 +13003,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -13017,7 +13017,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -13027,7 +13027,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -13039,7 +13039,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -13049,7 +13049,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -13057,7 +13057,7 @@ cont { lines { width: 5.8 color: 2236945 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -13068,7 +13068,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -13079,7 +13079,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -13089,7 +13089,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -13097,7 +13097,7 @@ cont { lines { width: 7.8 color: 2236945 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -13108,7 +13108,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -13119,7 +13119,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -13129,7 +13129,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -13137,7 +13137,7 @@ cont { lines { width: 9.0 color: 2236945 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -13148,7 +13148,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -13159,7 +13159,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -13169,7 +13169,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -13184,7 +13184,7 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -13198,7 +13198,7 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -13212,7 +13212,7 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -13226,7 +13226,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -13236,7 +13236,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16297 + priority: 16326 } } element { @@ -13248,7 +13248,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -13258,7 +13258,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16297 + priority: 16326 } } element { @@ -13270,7 +13270,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -13280,7 +13280,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16297 + priority: 16326 } } element { @@ -13292,7 +13292,7 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -13302,7 +13302,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16297 + priority: 16326 } } } @@ -13313,7 +13313,7 @@ cont { lines { width: 1.2 color: 2828327 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -13323,7 +13323,7 @@ cont { lines { width: 1.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -13333,7 +13333,7 @@ cont { lines { width: 1.8 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -13343,7 +13343,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -13351,7 +13351,7 @@ cont { lines { width: 3.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -13361,7 +13361,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -13369,7 +13369,7 @@ cont { lines { width: 4.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13379,7 +13379,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -13387,7 +13387,7 @@ cont { lines { width: 6.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13397,7 +13397,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -13405,7 +13405,7 @@ cont { lines { width: 9.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13415,7 +13415,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16324 + priority: 16356 } } element { @@ -13423,7 +13423,7 @@ cont { lines { width: 12.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13433,7 +13433,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16324 + priority: 16356 } } } @@ -13444,7 +13444,7 @@ cont { lines { width: 1.2 color: 2828327 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -13454,7 +13454,7 @@ cont { lines { width: 1.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -13464,7 +13464,7 @@ cont { lines { width: 1.8 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -13474,7 +13474,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -13482,7 +13482,7 @@ cont { lines { width: 3.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -13492,7 +13492,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -13500,7 +13500,7 @@ cont { lines { width: 4.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13510,7 +13510,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -13518,7 +13518,7 @@ cont { lines { width: 6.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13528,7 +13528,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -13536,7 +13536,7 @@ cont { lines { width: 9.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13546,7 +13546,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16324 + priority: 16356 } } element { @@ -13554,7 +13554,7 @@ cont { lines { width: 12.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13564,7 +13564,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16324 + priority: 16356 } } } @@ -13575,7 +13575,7 @@ cont { lines { width: 1.2 color: 2828327 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -13585,7 +13585,7 @@ cont { lines { width: 1.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -13595,7 +13595,7 @@ cont { lines { width: 1.8 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -13605,7 +13605,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -13613,7 +13613,7 @@ cont { lines { width: 3.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -13623,7 +13623,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -13635,14 +13635,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1323 + priority: 1355 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13652,7 +13652,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -13664,14 +13664,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1323 + priority: 1355 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13681,7 +13681,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -13693,14 +13693,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1323 + priority: 1355 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13710,7 +13710,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16324 + priority: 16356 } } element { @@ -13722,14 +13722,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1323 + priority: 1355 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -13739,7 +13739,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16324 + priority: 16356 } } } @@ -13750,7 +13750,7 @@ cont { lines { width: 0.9 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -13760,7 +13760,7 @@ cont { lines { width: 1.1 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -13770,7 +13770,7 @@ cont { lines { width: 1.2 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -13780,7 +13780,7 @@ cont { lines { width: 1.5 color: 3677972 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -13790,13 +13790,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 85 text_color: 11711154 } @@ -13806,7 +13806,7 @@ cont { lines { width: 1.7 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -13816,13 +13816,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 11711154 } @@ -13832,7 +13832,7 @@ cont { lines { width: 1.9 color: 3677972 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -13842,13 +13842,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 11711154 } @@ -13858,7 +13858,7 @@ cont { lines { width: 2.8 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -13868,13 +13868,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 120 text_color: 11711154 } @@ -13884,7 +13884,7 @@ cont { lines { width: 3.8 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -13894,13 +13894,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 175 text_color: 11711154 } @@ -13910,7 +13910,7 @@ cont { lines { width: 4.8 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -13920,13 +13920,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 250 text_color: 11711154 } @@ -13936,7 +13936,7 @@ cont { lines { width: 6.0 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -13946,13 +13946,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 11711154 } @@ -13962,7 +13962,7 @@ cont { lines { width: 9.0 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -13972,13 +13972,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 11711154 } @@ -13988,7 +13988,7 @@ cont { lines { width: 12.0 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -13998,13 +13998,13 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 11711154 } @@ -14014,7 +14014,7 @@ cont { lines { width: 15.0 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -14024,13 +14024,13 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16396 + priority: 16435 } shield { height: 11 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 350 text_color: 11711154 } @@ -14043,7 +14043,7 @@ cont { lines { width: 0.9 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14053,7 +14053,7 @@ cont { lines { width: 1.1 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14063,7 +14063,7 @@ cont { lines { width: 1.2 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14073,7 +14073,7 @@ cont { lines { width: 1.5 color: 3677972 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14083,13 +14083,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 85 text_color: 11711154 } @@ -14099,7 +14099,7 @@ cont { lines { width: 1.7 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14109,13 +14109,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 11711154 } @@ -14125,7 +14125,7 @@ cont { lines { width: 1.9 color: 3677972 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14135,13 +14135,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 11711154 } @@ -14151,21 +14151,21 @@ cont { lines { width: 2.8 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.4 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -14175,13 +14175,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 120 text_color: 11711154 } @@ -14191,21 +14191,21 @@ cont { lines { width: 3.8 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.6 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -14215,13 +14215,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 175 text_color: 11711154 } @@ -14231,21 +14231,21 @@ cont { lines { width: 4.8 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.6 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.4 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -14255,13 +14255,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 250 text_color: 11711154 } @@ -14271,21 +14271,21 @@ cont { lines { width: 6.0 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 12.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.8 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -14295,13 +14295,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 11711154 } @@ -14311,21 +14311,21 @@ cont { lines { width: 9.0 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 19.6 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 21.2 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -14335,13 +14335,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 11711154 } @@ -14351,21 +14351,21 @@ cont { lines { width: 12.0 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 26.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 28.0 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -14375,13 +14375,13 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 11711154 } @@ -14391,21 +14391,21 @@ cont { lines { width: 15.0 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 32.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 34.0 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -14415,13 +14415,13 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16396 + priority: 16435 } shield { height: 11 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 350 text_color: 11711154 } @@ -14434,7 +14434,7 @@ cont { lines { width: 0.9 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14444,7 +14444,7 @@ cont { lines { width: 1.1 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14454,7 +14454,7 @@ cont { lines { width: 1.2 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14464,7 +14464,7 @@ cont { lines { width: 1.5 color: 3677972 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14474,13 +14474,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 85 text_color: 11711154 } @@ -14490,7 +14490,7 @@ cont { lines { width: 1.7 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14500,13 +14500,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 11711154 } @@ -14520,14 +14520,14 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.9 color: 3677972 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -14537,13 +14537,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 11711154 } @@ -14557,14 +14557,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 2.8 color: 3677972 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -14574,13 +14574,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 120 text_color: 11711154 } @@ -14594,14 +14594,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.8 color: 3677972 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -14611,13 +14611,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 175 text_color: 11711154 } @@ -14631,14 +14631,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.8 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -14648,13 +14648,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 250 text_color: 11711154 } @@ -14668,14 +14668,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -14685,13 +14685,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 11711154 } @@ -14705,14 +14705,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.0 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -14722,13 +14722,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 11711154 } @@ -14742,14 +14742,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.0 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -14759,13 +14759,13 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 11711154 } @@ -14779,14 +14779,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 15.0 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -14796,13 +14796,13 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16396 + priority: 16435 } shield { height: 11 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 350 text_color: 11711154 } @@ -14817,7 +14817,7 @@ cont { height: 9 color: 5592405 } - priority: 15423 + priority: 15465 } } element { @@ -14827,7 +14827,7 @@ cont { height: 10 color: 5592405 } - priority: 15423 + priority: 15465 } } element { @@ -14837,7 +14837,7 @@ cont { height: 10 color: 5592405 } - priority: 15423 + priority: 15465 } } element { @@ -14847,7 +14847,7 @@ cont { height: 10 color: 5592405 } - priority: 15423 + priority: 15465 } } element { @@ -14857,7 +14857,7 @@ cont { height: 10 color: 5592405 } - priority: 15423 + priority: 15465 } } } @@ -14871,7 +14871,7 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16387 + priority: 16425 } } element { @@ -14882,7 +14882,7 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16387 + priority: 16425 } } element { @@ -14893,7 +14893,7 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16387 + priority: 16425 } } element { @@ -14901,7 +14901,7 @@ cont { lines { width: 1.4 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -14911,13 +14911,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 120 text_color: 11711154 } @@ -14927,7 +14927,7 @@ cont { lines { width: 1.8 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -14937,13 +14937,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 175 text_color: 11711154 } @@ -14953,7 +14953,7 @@ cont { lines { width: 2.4 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -14963,13 +14963,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 250 text_color: 11711154 } @@ -14979,7 +14979,7 @@ cont { lines { width: 3.0 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -14989,13 +14989,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 11711154 } @@ -15005,7 +15005,7 @@ cont { lines { width: 4.5 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -15015,13 +15015,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 11711154 } @@ -15031,7 +15031,7 @@ cont { lines { width: 6.0 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -15041,13 +15041,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 11711154 } @@ -15057,7 +15057,7 @@ cont { lines { width: 7.5 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -15067,13 +15067,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16387 + priority: 16425 } shield { height: 11 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 350 text_color: 11711154 } @@ -15089,7 +15089,7 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16387 + priority: 16425 } } element { @@ -15100,7 +15100,7 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16387 + priority: 16425 } } element { @@ -15111,7 +15111,7 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16387 + priority: 16425 } } element { @@ -15119,7 +15119,7 @@ cont { lines { width: 1.4 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -15129,13 +15129,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 120 text_color: 11711154 } @@ -15145,21 +15145,21 @@ cont { lines { width: 1.8 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.6 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -15169,13 +15169,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 175 text_color: 11711154 } @@ -15185,21 +15185,21 @@ cont { lines { width: 2.4 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.8 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 5.6 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -15209,13 +15209,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 250 text_color: 11711154 } @@ -15225,21 +15225,21 @@ cont { lines { width: 3.0 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 6.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.8 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -15249,13 +15249,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 11711154 } @@ -15265,21 +15265,21 @@ cont { lines { width: 4.5 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 10.6 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.2 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -15289,13 +15289,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 11711154 } @@ -15305,21 +15305,21 @@ cont { lines { width: 6.0 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 14.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 16.0 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -15329,13 +15329,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 11711154 } @@ -15345,21 +15345,21 @@ cont { lines { width: 7.5 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 17.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 19.0 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -15369,13 +15369,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16387 + priority: 16425 } shield { height: 11 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 350 text_color: 11711154 } @@ -15391,7 +15391,7 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16387 + priority: 16425 } } element { @@ -15402,7 +15402,7 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16387 + priority: 16425 } } element { @@ -15413,7 +15413,7 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16387 + priority: 16425 } } element { @@ -15425,14 +15425,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.4 color: 3677972 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -15442,13 +15442,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 120 text_color: 11711154 } @@ -15462,14 +15462,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.8 color: 3677972 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -15479,13 +15479,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 175 text_color: 11711154 } @@ -15499,14 +15499,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 2.4 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -15516,13 +15516,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 250 text_color: 11711154 } @@ -15536,14 +15536,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -15553,13 +15553,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 11711154 } @@ -15573,14 +15573,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.5 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -15590,13 +15590,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 11711154 } @@ -15610,14 +15610,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -15627,13 +15627,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 11711154 } @@ -15647,14 +15647,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.5 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -15664,13 +15664,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16387 + priority: 16425 } shield { height: 11 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 350 text_color: 11711154 } @@ -15687,7 +15687,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -15701,7 +15701,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -15711,7 +15711,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -15723,7 +15723,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -15733,7 +15733,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -15745,7 +15745,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -15755,7 +15755,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -15767,7 +15767,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -15777,7 +15777,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -15789,7 +15789,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -15799,7 +15799,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -15814,7 +15814,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -15828,7 +15828,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -15838,7 +15838,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -15850,7 +15850,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -15860,7 +15860,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -15872,7 +15872,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -15882,7 +15882,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -15894,7 +15894,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -15904,7 +15904,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -15916,7 +15916,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -15926,7 +15926,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -15941,7 +15941,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -15955,7 +15955,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -15965,7 +15965,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -15977,7 +15977,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -15987,7 +15987,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -15999,7 +15999,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16009,7 +16009,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16021,7 +16021,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16031,7 +16031,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16043,7 +16043,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16053,7 +16053,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -16068,7 +16068,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16082,7 +16082,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16092,7 +16092,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16104,7 +16104,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16114,7 +16114,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16126,7 +16126,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16136,7 +16136,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16148,7 +16148,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16158,7 +16158,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16170,7 +16170,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16180,7 +16180,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -16195,7 +16195,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16209,7 +16209,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16219,7 +16219,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16231,7 +16231,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16241,7 +16241,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16253,7 +16253,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16263,7 +16263,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16275,7 +16275,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16285,7 +16285,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16297,7 +16297,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16307,7 +16307,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -16322,7 +16322,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16336,7 +16336,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16346,7 +16346,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16358,7 +16358,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16368,7 +16368,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16380,7 +16380,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16390,7 +16390,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16402,7 +16402,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16412,7 +16412,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16424,7 +16424,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16434,7 +16434,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -16449,7 +16449,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16463,7 +16463,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16473,7 +16473,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16485,7 +16485,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16495,7 +16495,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16507,7 +16507,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16517,7 +16517,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16529,7 +16529,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16539,7 +16539,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16551,7 +16551,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16561,7 +16561,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -16576,7 +16576,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16590,7 +16590,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16600,7 +16600,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16612,7 +16612,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16622,7 +16622,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16634,7 +16634,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16644,7 +16644,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16656,7 +16656,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16666,7 +16666,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16678,7 +16678,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16688,7 +16688,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -16703,7 +16703,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16717,7 +16717,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16727,7 +16727,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16739,7 +16739,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16749,7 +16749,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16761,7 +16761,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16771,7 +16771,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16783,7 +16783,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16793,7 +16793,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16805,7 +16805,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16815,7 +16815,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -16830,7 +16830,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16844,7 +16844,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16854,7 +16854,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16866,7 +16866,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16876,7 +16876,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16888,7 +16888,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16898,7 +16898,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16910,7 +16910,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16920,7 +16920,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16932,7 +16932,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -16942,7 +16942,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -16957,7 +16957,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16971,7 +16971,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -16981,7 +16981,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -16993,7 +16993,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -17003,7 +17003,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -17015,7 +17015,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -17025,7 +17025,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -17037,7 +17037,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -17047,7 +17047,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -17059,7 +17059,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -17069,7 +17069,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -17084,7 +17084,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -17098,7 +17098,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -17108,7 +17108,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -17120,7 +17120,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -17130,7 +17130,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -17138,7 +17138,7 @@ cont { lines { width: 5.0 color: 2236945 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -17149,7 +17149,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -17160,7 +17160,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -17170,7 +17170,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -17178,7 +17178,7 @@ cont { lines { width: 7.0 color: 2236945 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -17189,7 +17189,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -17200,7 +17200,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -17210,7 +17210,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -17218,7 +17218,7 @@ cont { lines { width: 9.0 color: 2236945 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -17229,7 +17229,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -17240,7 +17240,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -17250,7 +17250,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -17265,7 +17265,7 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -17279,7 +17279,7 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -17289,7 +17289,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16297 + priority: 16326 } } element { @@ -17301,7 +17301,7 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -17311,7 +17311,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16297 + priority: 16326 } } element { @@ -17323,7 +17323,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -17333,7 +17333,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16297 + priority: 16326 } } element { @@ -17345,7 +17345,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -17355,7 +17355,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16297 + priority: 16326 } } element { @@ -17367,7 +17367,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -17377,7 +17377,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16297 + priority: 16326 } } element { @@ -17389,7 +17389,7 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -17399,7 +17399,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16297 + priority: 16326 } } } @@ -17414,7 +17414,7 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -17428,13 +17428,13 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } area { color: 2499106 - priority: -15703 + priority: -15674 } path_text { primary { @@ -17442,7 +17442,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16297 + priority: 16326 } } element { @@ -17454,13 +17454,13 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } area { color: 2499106 - priority: -15703 + priority: -15674 } path_text { primary { @@ -17468,7 +17468,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16297 + priority: 16326 } } element { @@ -17480,13 +17480,13 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } area { color: 2499106 - priority: -15703 + priority: -15674 } path_text { primary { @@ -17494,7 +17494,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16297 + priority: 16326 } } element { @@ -17506,13 +17506,13 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } area { color: 2499106 - priority: -15703 + priority: -15674 } path_text { primary { @@ -17520,7 +17520,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16297 + priority: 16326 } } element { @@ -17532,13 +17532,13 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } area { color: 2499106 - priority: -15703 + priority: -15674 } path_text { primary { @@ -17546,7 +17546,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16297 + priority: 16326 } } element { @@ -17558,13 +17558,13 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } area { color: 2499106 - priority: -15703 + priority: -15674 } path_text { primary { @@ -17572,7 +17572,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16297 + priority: 16326 } } } @@ -17587,14 +17587,14 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.6 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } @@ -17608,21 +17608,21 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.2 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.6 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -17632,7 +17632,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16297 + priority: 16326 } } element { @@ -17644,21 +17644,21 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -17668,7 +17668,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16297 + priority: 16326 } } element { @@ -17680,21 +17680,21 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 5.2 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -17704,7 +17704,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16297 + priority: 16326 } } element { @@ -17716,21 +17716,21 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 6.4 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.2 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -17740,7 +17740,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16297 + priority: 16326 } } element { @@ -17752,21 +17752,21 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.4 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.2 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -17776,7 +17776,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16297 + priority: 16326 } } element { @@ -17788,21 +17788,21 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 10.4 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 11.2 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -17812,7 +17812,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16297 + priority: 16326 } } } @@ -17827,7 +17827,7 @@ cont { dd: 2.0 dd: 1.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -17841,7 +17841,7 @@ cont { dd: 3.6 dd: 1.6 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -17851,7 +17851,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16297 + priority: 16326 } } element { @@ -17863,7 +17863,7 @@ cont { dd: 5.0 dd: 2.2 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: BUTTCAP } @@ -17873,7 +17873,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16297 + priority: 16326 } } element { @@ -17885,7 +17885,7 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1296 + priority: 1325 join: ROUNDJOIN cap: BUTTCAP } @@ -17896,7 +17896,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -17906,7 +17906,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16297 + priority: 16326 } } element { @@ -17918,7 +17918,7 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1296 + priority: 1325 join: ROUNDJOIN cap: BUTTCAP } @@ -17929,7 +17929,7 @@ cont { dd: 5.0 dd: 2.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -17939,7 +17939,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16297 + priority: 16326 } } element { @@ -17951,7 +17951,7 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1296 + priority: 1325 join: ROUNDJOIN cap: BUTTCAP } @@ -17962,7 +17962,7 @@ cont { dd: 7.0 dd: 3.0 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -17972,7 +17972,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16297 + priority: 16326 } } element { @@ -17984,7 +17984,7 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1296 + priority: 1325 join: ROUNDJOIN cap: BUTTCAP } @@ -17995,7 +17995,7 @@ cont { dd: 16.2 dd: 8.1 } - priority: 1297 + priority: 1326 join: ROUNDJOIN cap: ROUNDCAP } @@ -18005,7 +18005,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16297 + priority: 16326 } } } @@ -18016,7 +18016,7 @@ cont { lines { width: 0.9 color: 4334872 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18026,7 +18026,7 @@ cont { lines { width: 0.8 color: 4334872 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18036,7 +18036,7 @@ cont { lines { width: 1.2 color: 4334872 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18046,13 +18046,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 85 text_color: 11711154 } @@ -18062,7 +18062,7 @@ cont { lines { width: 1.5 color: 4334872 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18072,13 +18072,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 90 text_color: 11711154 } @@ -18088,7 +18088,7 @@ cont { lines { width: 1.7 color: 4334872 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18098,13 +18098,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 90 text_color: 11711154 } @@ -18114,7 +18114,7 @@ cont { lines { width: 2.4 color: 4334872 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: BUTTCAP } @@ -18124,13 +18124,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 120 text_color: 11711154 } @@ -18140,7 +18140,7 @@ cont { lines { width: 3.2 color: 4334872 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: BUTTCAP } @@ -18150,13 +18150,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 175 text_color: 11711154 } @@ -18166,7 +18166,7 @@ cont { lines { width: 4.2 color: 4334872 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: BUTTCAP } @@ -18176,13 +18176,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 250 text_color: 11711154 } @@ -18192,7 +18192,7 @@ cont { lines { width: 4.8 color: 4334872 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } @@ -18202,13 +18202,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 300 text_color: 11711154 } @@ -18218,7 +18218,7 @@ cont { lines { width: 7.0 color: 4334872 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } @@ -18228,13 +18228,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16378 + priority: 16415 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 300 text_color: 11711154 } @@ -18244,7 +18244,7 @@ cont { lines { width: 10.0 color: 4334872 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } @@ -18254,13 +18254,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16378 + priority: 16415 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 300 text_color: 11711154 } @@ -18270,7 +18270,7 @@ cont { lines { width: 13.0 color: 4334872 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } @@ -18280,13 +18280,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16378 + priority: 16415 } shield { height: 11 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 350 text_color: 11711154 } @@ -18299,7 +18299,7 @@ cont { lines { width: 0.9 color: 4334872 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18309,7 +18309,7 @@ cont { lines { width: 0.8 color: 4334872 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18319,7 +18319,7 @@ cont { lines { width: 1.2 color: 4334872 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18329,13 +18329,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 85 text_color: 11711154 } @@ -18345,7 +18345,7 @@ cont { lines { width: 1.5 color: 4334872 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18355,13 +18355,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 90 text_color: 11711154 } @@ -18371,7 +18371,7 @@ cont { lines { width: 1.7 color: 4334872 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18381,13 +18381,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 90 text_color: 11711154 } @@ -18397,7 +18397,7 @@ cont { lines { width: 2.4 color: 4334872 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: BUTTCAP } @@ -18407,13 +18407,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 120 text_color: 11711154 } @@ -18423,21 +18423,21 @@ cont { lines { width: 3.2 color: 4334872 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.4 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.2 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -18447,13 +18447,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 175 text_color: 11711154 } @@ -18463,21 +18463,21 @@ cont { lines { width: 4.2 color: 4334872 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.2 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -18487,13 +18487,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 250 text_color: 11711154 } @@ -18503,21 +18503,21 @@ cont { lines { width: 4.8 color: 4334872 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 9.6 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.4 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -18527,13 +18527,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 300 text_color: 11711154 } @@ -18543,21 +18543,21 @@ cont { lines { width: 7.0 color: 4334872 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 15.6 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 17.2 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -18567,13 +18567,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16378 + priority: 16415 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 300 text_color: 11711154 } @@ -18583,21 +18583,21 @@ cont { lines { width: 10.0 color: 4334872 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 22.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 24.0 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -18607,13 +18607,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16378 + priority: 16415 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 300 text_color: 11711154 } @@ -18623,21 +18623,21 @@ cont { lines { width: 13.0 color: 4334872 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 28.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 30.0 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -18647,13 +18647,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16378 + priority: 16415 } shield { height: 11 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 350 text_color: 11711154 } @@ -18666,7 +18666,7 @@ cont { lines { width: 0.9 color: 4334872 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18676,7 +18676,7 @@ cont { lines { width: 0.8 color: 4334872 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18686,7 +18686,7 @@ cont { lines { width: 1.2 color: 4334872 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18696,13 +18696,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 85 text_color: 11711154 } @@ -18712,7 +18712,7 @@ cont { lines { width: 1.5 color: 4334872 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18722,13 +18722,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 90 text_color: 11711154 } @@ -18738,7 +18738,7 @@ cont { lines { width: 1.7 color: 4334872 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -18748,13 +18748,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 90 text_color: 11711154 } @@ -18764,7 +18764,7 @@ cont { lines { width: 2.4 color: 4334872 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: BUTTCAP } @@ -18774,13 +18774,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 120 text_color: 11711154 } @@ -18794,14 +18794,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1377 + priority: 1414 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.2 color: 4991515 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: BUTTCAP } @@ -18811,13 +18811,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 175 text_color: 11711154 } @@ -18831,14 +18831,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1377 + priority: 1414 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.2 color: 4334872 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: BUTTCAP } @@ -18848,13 +18848,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 250 text_color: 11711154 } @@ -18868,14 +18868,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1377 + priority: 1414 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.8 color: 4334872 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } @@ -18885,13 +18885,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16378 + priority: 16415 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 300 text_color: 11711154 } @@ -18905,14 +18905,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1377 + priority: 1414 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.0 color: 4334872 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } @@ -18922,13 +18922,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16378 + priority: 16415 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 300 text_color: 11711154 } @@ -18942,14 +18942,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1377 + priority: 1414 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.0 color: 4334872 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } @@ -18959,13 +18959,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16378 + priority: 16415 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 300 text_color: 11711154 } @@ -18979,14 +18979,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1377 + priority: 1414 join: ROUNDJOIN cap: BUTTCAP } lines { width: 13.0 color: 4334872 - priority: 1378 + priority: 1415 join: ROUNDJOIN cap: ROUNDCAP } @@ -18996,13 +18996,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16378 + priority: 16415 } shield { height: 11 color: 0 stroke_color: 11711154 - priority: 16378 + priority: 16415 min_distance: 350 text_color: 11711154 } @@ -19018,7 +19018,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16369 + priority: 16405 } } element { @@ -19029,7 +19029,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16369 + priority: 16405 } } element { @@ -19040,7 +19040,7 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16369 + priority: 16405 } } element { @@ -19051,7 +19051,7 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16369 + priority: 16405 } } element { @@ -19059,7 +19059,7 @@ cont { lines { width: 3.2 color: 4334872 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: BUTTCAP } @@ -19069,13 +19069,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16369 + priority: 16405 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16369 + priority: 16405 min_distance: 175 text_color: 11711154 } @@ -19085,7 +19085,7 @@ cont { lines { width: 4.2 color: 4334872 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: BUTTCAP } @@ -19095,13 +19095,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16369 + priority: 16405 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16369 + priority: 16405 min_distance: 250 text_color: 11711154 } @@ -19111,7 +19111,7 @@ cont { lines { width: 4.8 color: 4334872 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } @@ -19121,13 +19121,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16369 + priority: 16405 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16369 + priority: 16405 min_distance: 300 text_color: 11711154 } @@ -19137,7 +19137,7 @@ cont { lines { width: 7.0 color: 4334872 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } @@ -19147,13 +19147,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16369 + priority: 16405 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16369 + priority: 16405 min_distance: 300 text_color: 11711154 } @@ -19163,7 +19163,7 @@ cont { lines { width: 10.0 color: 4334872 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } @@ -19173,13 +19173,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16369 + priority: 16405 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16369 + priority: 16405 min_distance: 300 text_color: 11711154 } @@ -19189,7 +19189,7 @@ cont { lines { width: 13.0 color: 4334872 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } @@ -19199,13 +19199,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16369 + priority: 16405 } shield { height: 11 color: 0 stroke_color: 11711154 - priority: 16369 + priority: 16405 min_distance: 350 text_color: 11711154 } @@ -19221,7 +19221,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16369 + priority: 16405 } } element { @@ -19232,7 +19232,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16369 + priority: 16405 } } element { @@ -19243,7 +19243,7 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16369 + priority: 16405 } } element { @@ -19254,7 +19254,7 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16369 + priority: 16405 } } element { @@ -19262,21 +19262,21 @@ cont { lines { width: 3.2 color: 4334872 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.4 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.2 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -19286,13 +19286,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16369 + priority: 16405 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16369 + priority: 16405 min_distance: 175 text_color: 11711154 } @@ -19302,21 +19302,21 @@ cont { lines { width: 4.2 color: 4334872 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.2 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -19326,13 +19326,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16369 + priority: 16405 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16369 + priority: 16405 min_distance: 250 text_color: 11711154 } @@ -19342,21 +19342,21 @@ cont { lines { width: 4.8 color: 4334872 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 9.6 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.4 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -19366,13 +19366,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16369 + priority: 16405 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16369 + priority: 16405 min_distance: 300 text_color: 11711154 } @@ -19382,21 +19382,21 @@ cont { lines { width: 7.0 color: 4334872 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 15.6 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 17.2 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -19406,13 +19406,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16369 + priority: 16405 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16369 + priority: 16405 min_distance: 300 text_color: 11711154 } @@ -19422,21 +19422,21 @@ cont { lines { width: 10.0 color: 4334872 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 22.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 24.0 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -19446,13 +19446,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16369 + priority: 16405 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16369 + priority: 16405 min_distance: 300 text_color: 11711154 } @@ -19462,21 +19462,21 @@ cont { lines { width: 13.0 color: 4334872 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 28.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 30.0 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -19486,13 +19486,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16369 + priority: 16405 } shield { height: 11 color: 0 stroke_color: 11711154 - priority: 16369 + priority: 16405 min_distance: 350 text_color: 11711154 } @@ -19508,7 +19508,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16369 + priority: 16405 } } element { @@ -19519,7 +19519,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16369 + priority: 16405 } } element { @@ -19530,7 +19530,7 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16369 + priority: 16405 } } element { @@ -19541,7 +19541,7 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16369 + priority: 16405 } } element { @@ -19553,14 +19553,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1368 + priority: 1404 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.2 color: 4991515 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: BUTTCAP } @@ -19570,13 +19570,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16369 + priority: 16405 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16369 + priority: 16405 min_distance: 175 text_color: 11711154 } @@ -19590,14 +19590,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1368 + priority: 1404 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.2 color: 4334872 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: BUTTCAP } @@ -19607,13 +19607,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16369 + priority: 16405 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16369 + priority: 16405 min_distance: 250 text_color: 11711154 } @@ -19627,14 +19627,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1368 + priority: 1404 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.8 color: 4334872 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } @@ -19644,13 +19644,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16369 + priority: 16405 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16369 + priority: 16405 min_distance: 300 text_color: 11711154 } @@ -19664,14 +19664,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1368 + priority: 1404 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.0 color: 4334872 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } @@ -19681,13 +19681,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16369 + priority: 16405 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16369 + priority: 16405 min_distance: 300 text_color: 11711154 } @@ -19701,14 +19701,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1368 + priority: 1404 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.0 color: 4334872 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } @@ -19718,13 +19718,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16369 + priority: 16405 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16369 + priority: 16405 min_distance: 300 text_color: 11711154 } @@ -19738,14 +19738,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1368 + priority: 1404 join: ROUNDJOIN cap: BUTTCAP } lines { width: 13.0 color: 4334872 - priority: 1369 + priority: 1405 join: ROUNDJOIN cap: ROUNDCAP } @@ -19755,13 +19755,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16369 + priority: 16405 } shield { height: 11 color: 0 stroke_color: 11711154 - priority: 16369 + priority: 16405 min_distance: 350 text_color: 11711154 } @@ -19778,7 +19778,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: BUTTCAP } @@ -19792,7 +19792,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: BUTTCAP } @@ -19806,7 +19806,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: BUTTCAP } @@ -19816,7 +19816,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16261 + priority: 16287 } } element { @@ -19828,7 +19828,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -19838,7 +19838,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16261 + priority: 16287 } } element { @@ -19850,7 +19850,7 @@ cont { dd: 10.8 dd: 4.5 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -19860,7 +19860,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16261 + priority: 16287 } } element { @@ -19872,7 +19872,7 @@ cont { dd: 13.5 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -19882,7 +19882,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16261 + priority: 16287 } } element { @@ -19894,7 +19894,7 @@ cont { dd: 18.0 dd: 6.2 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -19904,7 +19904,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16261 + priority: 16287 } } } @@ -19915,7 +19915,7 @@ cont { lines { width: 1.0 color: 2828327 - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -19925,7 +19925,7 @@ cont { lines { width: 1.5 color: 2828327 - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -19935,7 +19935,7 @@ cont { lines { width: 1.8 color: 2828327 - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -19945,7 +19945,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -19953,7 +19953,7 @@ cont { lines { width: 3.0 color: 2828327 - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -19963,7 +19963,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -19971,7 +19971,7 @@ cont { lines { width: 3.0 color: 2828327 - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -19981,7 +19981,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -19989,7 +19989,7 @@ cont { lines { width: 4.0 color: 2828327 - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -19999,7 +19999,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -20010,7 +20010,7 @@ cont { lines { width: 0.8 color: 2828327 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -20020,7 +20020,7 @@ cont { lines { width: 1.2 color: 2828327 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -20030,13 +20030,13 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 90 text_color: 11711154 } @@ -20046,7 +20046,7 @@ cont { lines { width: 1.2 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20056,13 +20056,13 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 120 text_color: 11711154 } @@ -20072,7 +20072,7 @@ cont { lines { width: 1.8 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20082,13 +20082,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 175 text_color: 11711154 } @@ -20098,7 +20098,7 @@ cont { lines { width: 3.2 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20108,13 +20108,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 250 text_color: 11711154 } @@ -20124,7 +20124,7 @@ cont { lines { width: 4.4 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20134,13 +20134,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 11711154 } @@ -20150,7 +20150,7 @@ cont { lines { width: 6.0 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20160,13 +20160,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 11711154 } @@ -20176,7 +20176,7 @@ cont { lines { width: 9.0 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20186,13 +20186,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 11711154 } @@ -20202,7 +20202,7 @@ cont { lines { width: 12.0 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20212,13 +20212,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16342 + priority: 16376 } shield { height: 11 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 350 text_color: 11711154 } @@ -20231,7 +20231,7 @@ cont { lines { width: 0.8 color: 2828327 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -20241,7 +20241,7 @@ cont { lines { width: 1.2 color: 2828327 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -20251,13 +20251,13 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 90 text_color: 11711154 } @@ -20267,7 +20267,7 @@ cont { lines { width: 1.2 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20277,13 +20277,13 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 120 text_color: 11711154 } @@ -20293,7 +20293,7 @@ cont { lines { width: 1.8 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20303,13 +20303,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 175 text_color: 11711154 } @@ -20319,7 +20319,7 @@ cont { lines { width: 3.2 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20329,13 +20329,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 250 text_color: 11711154 } @@ -20345,7 +20345,7 @@ cont { lines { width: 4.4 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20355,13 +20355,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 11711154 } @@ -20371,7 +20371,7 @@ cont { lines { width: 6.0 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20381,13 +20381,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 11711154 } @@ -20397,7 +20397,7 @@ cont { lines { width: 9.0 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20407,13 +20407,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 11711154 } @@ -20423,7 +20423,7 @@ cont { lines { width: 12.0 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20433,13 +20433,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16342 + priority: 16376 } shield { height: 11 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 350 text_color: 11711154 } @@ -20452,7 +20452,7 @@ cont { lines { width: 0.8 color: 2828327 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -20462,7 +20462,7 @@ cont { lines { width: 1.2 color: 2828327 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -20472,13 +20472,13 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 90 text_color: 11711154 } @@ -20488,7 +20488,7 @@ cont { lines { width: 1.2 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20498,13 +20498,13 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 120 text_color: 11711154 } @@ -20514,21 +20514,21 @@ cont { lines { width: 1.8 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.6 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -20538,13 +20538,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 175 text_color: 11711154 } @@ -20554,21 +20554,21 @@ cont { lines { width: 3.2 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.4 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.2 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -20578,13 +20578,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 250 text_color: 11711154 } @@ -20594,21 +20594,21 @@ cont { lines { width: 4.4 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.8 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.6 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -20618,13 +20618,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 11711154 } @@ -20634,21 +20634,21 @@ cont { lines { width: 6.0 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 13.6 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 15.2 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -20658,13 +20658,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 11711154 } @@ -20674,21 +20674,21 @@ cont { lines { width: 9.0 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 20.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 22.0 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -20698,13 +20698,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 11711154 } @@ -20714,21 +20714,21 @@ cont { lines { width: 12.0 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 26.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 28.0 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -20738,13 +20738,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16342 + priority: 16376 } shield { height: 11 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 350 text_color: 11711154 } @@ -20757,7 +20757,7 @@ cont { lines { width: 0.8 color: 2828327 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -20767,7 +20767,7 @@ cont { lines { width: 1.2 color: 2828327 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -20777,13 +20777,13 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 90 text_color: 11711154 } @@ -20793,7 +20793,7 @@ cont { lines { width: 1.2 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20803,13 +20803,13 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 120 text_color: 11711154 } @@ -20819,7 +20819,7 @@ cont { lines { width: 1.8 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20829,13 +20829,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 175 text_color: 11711154 } @@ -20845,7 +20845,7 @@ cont { lines { width: 3.2 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -20855,13 +20855,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 250 text_color: 11711154 } @@ -20875,14 +20875,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1375 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20892,13 +20892,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 11711154 } @@ -20912,14 +20912,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1375 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20929,13 +20929,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 11711154 } @@ -20949,14 +20949,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1375 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.0 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -20966,13 +20966,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 11711154 } @@ -20986,14 +20986,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1375 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.0 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -21003,18 +21003,85 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16342 + priority: 16376 } shield { height: 11 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 350 text_color: 11711154 } } } +cont { + name: "highway-rest_area" + element { + scale: 16 + symbol { + name: "picnic-m" + priority: 16623 + min_distance: 10 + } + path_text { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 16623 + } + } + element { + scale: 17 + symbol { + name: "picnic-l" + priority: 16623 + min_distance: 10 + } + path_text { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 16623 + } + } + element { + scale: 18 + symbol { + name: "picnic-l" + priority: 16623 + min_distance: 10 + } + path_text { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 16623 + } + } + element { + scale: 19 + symbol { + name: "picnic-l" + priority: 16623 + min_distance: 10 + } + path_text { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 16623 + } + } +} cont { name: "highway-road" element { @@ -21022,7 +21089,7 @@ cont { lines { width: 1.2 color: 2828327 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -21032,7 +21099,7 @@ cont { lines { width: 1.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -21042,7 +21109,7 @@ cont { lines { width: 1.8 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -21052,7 +21119,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -21060,7 +21127,7 @@ cont { lines { width: 3.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -21070,7 +21137,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -21078,7 +21145,7 @@ cont { lines { width: 4.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -21088,7 +21155,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -21096,7 +21163,7 @@ cont { lines { width: 6.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -21106,7 +21173,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -21114,7 +21181,7 @@ cont { lines { width: 9.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -21124,7 +21191,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16324 + priority: 16356 } } element { @@ -21132,7 +21199,7 @@ cont { lines { width: 12.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -21142,7 +21209,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16324 + priority: 16356 } } } @@ -21153,7 +21220,7 @@ cont { lines { width: 1.2 color: 2828327 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -21163,7 +21230,7 @@ cont { lines { width: 1.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -21173,7 +21240,7 @@ cont { lines { width: 1.8 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -21183,7 +21250,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -21191,7 +21258,7 @@ cont { lines { width: 3.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -21201,7 +21268,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -21209,21 +21276,21 @@ cont { lines { width: 4.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -21233,7 +21300,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -21241,21 +21308,21 @@ cont { lines { width: 6.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 12.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.4 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -21265,7 +21332,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -21273,21 +21340,21 @@ cont { lines { width: 9.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 18.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 18.4 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -21297,7 +21364,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16324 + priority: 16356 } } element { @@ -21305,21 +21372,21 @@ cont { lines { width: 12.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 24.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 24.4 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -21329,7 +21396,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16324 + priority: 16356 } } } @@ -21340,7 +21407,7 @@ cont { lines { width: 1.2 color: 2828327 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -21350,7 +21417,7 @@ cont { lines { width: 1.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -21360,7 +21427,7 @@ cont { lines { width: 1.8 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -21370,7 +21437,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -21378,7 +21445,7 @@ cont { lines { width: 3.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -21388,7 +21455,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -21396,7 +21463,7 @@ cont { lines { width: 4.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -21406,7 +21473,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -21414,7 +21481,7 @@ cont { lines { width: 6.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -21424,7 +21491,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -21432,7 +21499,7 @@ cont { lines { width: 9.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -21442,7 +21509,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16324 + priority: 16356 } } element { @@ -21450,7 +21517,7 @@ cont { lines { width: 12.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -21460,7 +21527,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16324 + priority: 16356 } } } @@ -21471,7 +21538,7 @@ cont { lines { width: 1.0 color: 2828327 - priority: 1360 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -21481,7 +21548,7 @@ cont { color: 6710886 stroke_color: 856756480 } - priority: 16360 + priority: 16396 } } element { @@ -21489,7 +21556,7 @@ cont { lines { width: 1.3 color: 2828327 - priority: 1360 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -21499,7 +21566,7 @@ cont { color: 6710886 stroke_color: 856756480 } - priority: 16360 + priority: 16396 } } element { @@ -21507,7 +21574,7 @@ cont { lines { width: 1.6 color: 2828327 - priority: 1360 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -21517,13 +21584,13 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16360 + priority: 16396 min_distance: 90 text_color: 11711154 } @@ -21533,7 +21600,7 @@ cont { lines { width: 2.2 color: 2828327 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: BUTTCAP } @@ -21543,13 +21610,13 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16360 + priority: 16396 min_distance: 120 text_color: 11711154 } @@ -21559,7 +21626,7 @@ cont { lines { width: 3.0 color: 2828327 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: BUTTCAP } @@ -21569,13 +21636,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16360 + priority: 16396 min_distance: 175 text_color: 11711154 } @@ -21585,7 +21652,7 @@ cont { lines { width: 4.0 color: 2828327 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: BUTTCAP } @@ -21595,13 +21662,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16360 + priority: 16396 min_distance: 250 text_color: 11711154 } @@ -21611,7 +21678,7 @@ cont { lines { width: 4.8 color: 2828327 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } @@ -21621,13 +21688,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16360 + priority: 16396 min_distance: 300 text_color: 11711154 } @@ -21637,7 +21704,7 @@ cont { lines { width: 7.0 color: 2828327 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } @@ -21647,13 +21714,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16360 + priority: 16396 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16360 + priority: 16396 min_distance: 300 text_color: 11711154 } @@ -21663,7 +21730,7 @@ cont { lines { width: 10.0 color: 2828327 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } @@ -21673,13 +21740,13 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16360 + priority: 16396 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16360 + priority: 16396 min_distance: 300 text_color: 11711154 } @@ -21689,7 +21756,7 @@ cont { lines { width: 13.0 color: 2828327 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } @@ -21699,13 +21766,13 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16360 + priority: 16396 } shield { height: 11 color: 0 stroke_color: 11711154 - priority: 16360 + priority: 16396 min_distance: 350 text_color: 11711154 } @@ -21718,7 +21785,7 @@ cont { lines { width: 1.0 color: 2828327 - priority: 1360 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -21728,7 +21795,7 @@ cont { color: 6710886 stroke_color: 856756480 } - priority: 16360 + priority: 16396 } } element { @@ -21736,7 +21803,7 @@ cont { lines { width: 1.3 color: 2828327 - priority: 1360 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -21746,7 +21813,7 @@ cont { color: 6710886 stroke_color: 856756480 } - priority: 16360 + priority: 16396 } } element { @@ -21754,7 +21821,7 @@ cont { lines { width: 1.6 color: 2828327 - priority: 1360 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -21764,13 +21831,13 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16360 + priority: 16396 min_distance: 90 text_color: 11711154 } @@ -21780,7 +21847,7 @@ cont { lines { width: 2.2 color: 2828327 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: BUTTCAP } @@ -21790,13 +21857,13 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16360 + priority: 16396 min_distance: 120 text_color: 11711154 } @@ -21806,21 +21873,21 @@ cont { lines { width: 3.0 color: 2828327 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.8 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -21830,13 +21897,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16360 + priority: 16396 min_distance: 175 text_color: 11711154 } @@ -21846,21 +21913,21 @@ cont { lines { width: 4.0 color: 2828327 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.8 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -21870,13 +21937,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16360 + priority: 16396 min_distance: 250 text_color: 11711154 } @@ -21886,21 +21953,21 @@ cont { lines { width: 4.8 color: 2828327 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 9.6 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.4 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -21910,13 +21977,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16360 + priority: 16396 min_distance: 300 text_color: 11711154 } @@ -21926,21 +21993,21 @@ cont { lines { width: 7.0 color: 2828327 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 15.6 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 17.2 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -21950,13 +22017,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16360 + priority: 16396 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16360 + priority: 16396 min_distance: 300 text_color: 11711154 } @@ -21966,21 +22033,21 @@ cont { lines { width: 10.0 color: 2828327 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 22.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 24.0 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -21990,13 +22057,13 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16360 + priority: 16396 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16360 + priority: 16396 min_distance: 300 text_color: 11711154 } @@ -22006,21 +22073,21 @@ cont { lines { width: 13.0 color: 2828327 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 28.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 30.0 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -22030,13 +22097,13 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16360 + priority: 16396 } shield { height: 11 color: 0 stroke_color: 11711154 - priority: 16360 + priority: 16396 min_distance: 350 text_color: 11711154 } @@ -22049,7 +22116,7 @@ cont { lines { width: 1.0 color: 2828327 - priority: 1360 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -22059,7 +22126,7 @@ cont { color: 6710886 stroke_color: 856756480 } - priority: 16360 + priority: 16396 } } element { @@ -22067,7 +22134,7 @@ cont { lines { width: 1.3 color: 2828327 - priority: 1360 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -22077,7 +22144,7 @@ cont { color: 6710886 stroke_color: 856756480 } - priority: 16360 + priority: 16396 } } element { @@ -22085,7 +22152,7 @@ cont { lines { width: 1.6 color: 2828327 - priority: 1360 + priority: 1396 join: BEVELJOIN cap: BUTTCAP } @@ -22095,13 +22162,13 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16360 + priority: 16396 min_distance: 90 text_color: 11711154 } @@ -22111,7 +22178,7 @@ cont { lines { width: 2.2 color: 2828327 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: BUTTCAP } @@ -22121,13 +22188,13 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16360 + priority: 16396 min_distance: 120 text_color: 11711154 } @@ -22137,7 +22204,7 @@ cont { lines { width: 3.0 color: 2828327 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: BUTTCAP } @@ -22147,13 +22214,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16360 + priority: 16396 min_distance: 175 text_color: 11711154 } @@ -22163,7 +22230,7 @@ cont { lines { width: 4.0 color: 2828327 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: BUTTCAP } @@ -22173,13 +22240,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16360 + priority: 16396 min_distance: 250 text_color: 11711154 } @@ -22193,14 +22260,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1359 + priority: 1395 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.8 color: 2828327 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } @@ -22210,13 +22277,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16360 + priority: 16396 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16360 + priority: 16396 min_distance: 300 text_color: 11711154 } @@ -22230,14 +22297,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1359 + priority: 1395 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.0 color: 2828327 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } @@ -22247,13 +22314,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16360 + priority: 16396 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16360 + priority: 16396 min_distance: 300 text_color: 11711154 } @@ -22267,14 +22334,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1359 + priority: 1395 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.0 color: 2828327 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } @@ -22284,13 +22351,13 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16360 + priority: 16396 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16360 + priority: 16396 min_distance: 300 text_color: 11711154 } @@ -22304,14 +22371,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1359 + priority: 1395 join: ROUNDJOIN cap: BUTTCAP } lines { width: 13.0 color: 2828327 - priority: 1360 + priority: 1396 join: ROUNDJOIN cap: ROUNDCAP } @@ -22321,13 +22388,13 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16360 + priority: 16396 } shield { height: 11 color: 0 stroke_color: 11711154 - priority: 16360 + priority: 16396 min_distance: 350 text_color: 11711154 } @@ -22340,7 +22407,7 @@ cont { lines { width: 3.0 color: 2828327 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: BUTTCAP } @@ -22350,7 +22417,7 @@ cont { lines { width: 4.0 color: 2828327 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: BUTTCAP } @@ -22360,7 +22427,7 @@ cont { lines { width: 4.8 color: 2828327 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } @@ -22370,7 +22437,7 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16351 + priority: 16386 } } element { @@ -22378,7 +22445,7 @@ cont { lines { width: 7.0 color: 2828327 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } @@ -22388,7 +22455,7 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16351 + priority: 16386 } } element { @@ -22396,7 +22463,7 @@ cont { lines { width: 10.0 color: 2828327 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } @@ -22406,7 +22473,7 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16351 + priority: 16386 } } element { @@ -22414,7 +22481,7 @@ cont { lines { width: 13.0 color: 2828327 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } @@ -22424,7 +22491,7 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16351 + priority: 16386 } } } @@ -22435,21 +22502,21 @@ cont { lines { width: 3.0 color: 2828327 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.8 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -22459,21 +22526,21 @@ cont { lines { width: 4.0 color: 2828327 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.8 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -22483,21 +22550,21 @@ cont { lines { width: 4.8 color: 2828327 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 9.6 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.4 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -22507,7 +22574,7 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16351 + priority: 16386 } } element { @@ -22515,21 +22582,21 @@ cont { lines { width: 7.0 color: 2828327 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 15.6 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 17.2 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -22539,7 +22606,7 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16351 + priority: 16386 } } element { @@ -22547,21 +22614,21 @@ cont { lines { width: 10.0 color: 2828327 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 22.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 24.0 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -22571,7 +22638,7 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16351 + priority: 16386 } } element { @@ -22579,21 +22646,21 @@ cont { lines { width: 13.0 color: 2828327 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 28.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 30.0 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -22603,7 +22670,7 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16351 + priority: 16386 } } } @@ -22614,7 +22681,7 @@ cont { lines { width: 3.0 color: 2828327 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: BUTTCAP } @@ -22624,7 +22691,7 @@ cont { lines { width: 4.0 color: 2828327 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: BUTTCAP } @@ -22638,14 +22705,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1350 + priority: 1385 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.8 color: 2828327 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } @@ -22655,7 +22722,7 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16351 + priority: 16386 } } element { @@ -22667,14 +22734,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1350 + priority: 1385 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.0 color: 2828327 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } @@ -22684,7 +22751,7 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16351 + priority: 16386 } } element { @@ -22696,14 +22763,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1350 + priority: 1385 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.0 color: 2828327 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } @@ -22713,7 +22780,7 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16351 + priority: 16386 } } element { @@ -22725,14 +22792,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1350 + priority: 1385 join: ROUNDJOIN cap: BUTTCAP } lines { width: 13.0 color: 2828327 - priority: 1351 + priority: 1386 join: ROUNDJOIN cap: ROUNDCAP } @@ -22742,7 +22809,7 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16351 + priority: 16386 } } } @@ -22753,7 +22820,7 @@ cont { lines { width: 1.2 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: BUTTCAP } @@ -22763,7 +22830,7 @@ cont { lines { width: 1.6 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -22773,7 +22840,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16288 + priority: 16316 } } element { @@ -22781,7 +22848,7 @@ cont { lines { width: 2.0 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -22791,7 +22858,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16288 + priority: 16316 } } element { @@ -22799,7 +22866,7 @@ cont { lines { width: 3.0 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -22809,7 +22876,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16288 + priority: 16316 } } element { @@ -22817,7 +22884,7 @@ cont { lines { width: 4.0 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -22827,7 +22894,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16288 + priority: 16316 } } } @@ -22838,7 +22905,7 @@ cont { lines { width: 1.2 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: BUTTCAP } @@ -22848,7 +22915,7 @@ cont { lines { width: 1.6 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -22858,7 +22925,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16288 + priority: 16316 } } element { @@ -22866,7 +22933,7 @@ cont { lines { width: 2.0 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -22876,7 +22943,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16288 + priority: 16316 } } element { @@ -22884,7 +22951,7 @@ cont { lines { width: 3.0 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -22894,7 +22961,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16288 + priority: 16316 } } element { @@ -22902,7 +22969,7 @@ cont { lines { width: 4.0 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -22912,7 +22979,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16288 + priority: 16316 } } } @@ -22923,7 +22990,7 @@ cont { lines { width: 1.2 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: BUTTCAP } @@ -22933,21 +23000,21 @@ cont { lines { width: 1.6 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 3.2 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.6 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -22957,7 +23024,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16288 + priority: 16316 } } element { @@ -22965,21 +23032,21 @@ cont { lines { width: 2.0 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 4.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -22989,7 +23056,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16288 + priority: 16316 } } element { @@ -22997,21 +23064,21 @@ cont { lines { width: 3.0 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 6.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.4 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -23021,7 +23088,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16288 + priority: 16316 } } element { @@ -23029,21 +23096,21 @@ cont { lines { width: 4.0 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -23053,7 +23120,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16288 + priority: 16316 } } } @@ -23064,7 +23131,7 @@ cont { lines { width: 1.6 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23074,7 +23141,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16288 + priority: 16316 } } element { @@ -23082,7 +23149,7 @@ cont { lines { width: 2.0 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23092,7 +23159,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16288 + priority: 16316 } } element { @@ -23100,7 +23167,7 @@ cont { lines { width: 3.0 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23110,7 +23177,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16288 + priority: 16316 } } element { @@ -23118,7 +23185,7 @@ cont { lines { width: 4.0 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23128,7 +23195,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16288 + priority: 16316 } } } @@ -23139,7 +23206,7 @@ cont { lines { width: 1.6 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23149,7 +23216,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16288 + priority: 16316 } } element { @@ -23157,7 +23224,7 @@ cont { lines { width: 2.0 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23167,7 +23234,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16288 + priority: 16316 } } element { @@ -23175,7 +23242,7 @@ cont { lines { width: 3.0 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23185,7 +23252,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16288 + priority: 16316 } } element { @@ -23193,7 +23260,7 @@ cont { lines { width: 4.0 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23203,7 +23270,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16288 + priority: 16316 } } } @@ -23214,21 +23281,21 @@ cont { lines { width: 1.6 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 3.2 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.6 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -23238,7 +23305,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16288 + priority: 16316 } } element { @@ -23246,21 +23313,21 @@ cont { lines { width: 2.0 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 4.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -23270,7 +23337,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16288 + priority: 16316 } } element { @@ -23278,21 +23345,21 @@ cont { lines { width: 3.0 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 6.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.4 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -23302,7 +23369,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16288 + priority: 16316 } } element { @@ -23310,21 +23377,21 @@ cont { lines { width: 4.0 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -23334,7 +23401,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16288 + priority: 16316 } } } @@ -23345,7 +23412,7 @@ cont { lines { width: 1.6 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23355,7 +23422,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16288 + priority: 16316 } } element { @@ -23363,7 +23430,7 @@ cont { lines { width: 2.0 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23373,7 +23440,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16288 + priority: 16316 } } element { @@ -23381,7 +23448,7 @@ cont { lines { width: 3.0 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23391,7 +23458,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16288 + priority: 16316 } } element { @@ -23399,7 +23466,7 @@ cont { lines { width: 4.0 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23409,7 +23476,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16288 + priority: 16316 } } } @@ -23420,7 +23487,7 @@ cont { lines { width: 1.2 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: BUTTCAP } @@ -23430,7 +23497,7 @@ cont { lines { width: 1.6 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23440,7 +23507,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16288 + priority: 16316 } } element { @@ -23448,7 +23515,7 @@ cont { lines { width: 2.0 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23458,7 +23525,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16288 + priority: 16316 } } element { @@ -23466,7 +23533,7 @@ cont { lines { width: 3.0 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23476,7 +23543,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16288 + priority: 16316 } } element { @@ -23484,7 +23551,7 @@ cont { lines { width: 4.0 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23494,7 +23561,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16288 + priority: 16316 } } } @@ -23505,7 +23572,7 @@ cont { lines { width: 1.2 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: BUTTCAP } @@ -23515,7 +23582,7 @@ cont { lines { width: 1.6 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23525,7 +23592,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16288 + priority: 16316 } } element { @@ -23533,7 +23600,7 @@ cont { lines { width: 2.0 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23543,7 +23610,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16288 + priority: 16316 } } element { @@ -23551,7 +23618,7 @@ cont { lines { width: 3.0 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23561,7 +23628,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16288 + priority: 16316 } } element { @@ -23569,7 +23636,7 @@ cont { lines { width: 4.0 color: 2828327 - priority: 1288 + priority: 1316 join: ROUNDJOIN cap: ROUNDCAP } @@ -23579,7 +23646,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16288 + priority: 16316 } } } @@ -23590,7 +23657,7 @@ cont { symbol { name: "speedcam-m" apply_for_type: 1 - priority: 16567 + priority: 16623 } } element { @@ -23598,7 +23665,7 @@ cont { symbol { name: "speedcam-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } } element { @@ -23606,7 +23673,7 @@ cont { symbol { name: "speedcam-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } } element { @@ -23614,7 +23681,7 @@ cont { symbol { name: "speedcam-l" apply_for_type: 1 - priority: 16567 + priority: 16623 } } } @@ -23629,7 +23696,7 @@ cont { dd: 1.5 dd: 1.5 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -23639,7 +23706,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } element { @@ -23651,7 +23718,7 @@ cont { dd: 2.3 dd: 2.3 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -23661,7 +23728,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } element { @@ -23673,7 +23740,7 @@ cont { dd: 3.2 dd: 3.2 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -23683,7 +23750,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } element { @@ -23695,7 +23762,7 @@ cont { dd: 4.0 dd: 4.0 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -23705,7 +23772,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } } @@ -23720,7 +23787,7 @@ cont { dd: 1.5 dd: 1.5 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -23730,7 +23797,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } element { @@ -23742,7 +23809,7 @@ cont { dd: 2.3 dd: 2.3 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -23752,7 +23819,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } element { @@ -23764,7 +23831,7 @@ cont { dd: 3.2 dd: 3.2 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -23774,7 +23841,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } element { @@ -23786,7 +23853,7 @@ cont { dd: 4.0 dd: 4.0 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -23796,7 +23863,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } } @@ -23811,7 +23878,7 @@ cont { dd: 1.5 dd: 1.5 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -23821,7 +23888,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } element { @@ -23833,7 +23900,7 @@ cont { dd: 2.3 dd: 2.3 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -23843,7 +23910,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } element { @@ -23855,7 +23922,7 @@ cont { dd: 3.2 dd: 3.2 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -23865,7 +23932,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } element { @@ -23877,7 +23944,7 @@ cont { dd: 4.0 dd: 4.0 } - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -23887,7 +23954,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16423 + priority: 16465 } } } @@ -23898,7 +23965,7 @@ cont { lines { width: 0.8 color: 2828327 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -23908,7 +23975,7 @@ cont { lines { width: 1.2 color: 2828327 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -23918,13 +23985,13 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 90 text_color: 11711154 } @@ -23934,7 +24001,7 @@ cont { lines { width: 1.2 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -23944,13 +24011,13 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 120 text_color: 11711154 } @@ -23960,7 +24027,7 @@ cont { lines { width: 1.8 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -23970,13 +24037,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 175 text_color: 11711154 } @@ -23986,7 +24053,7 @@ cont { lines { width: 3.2 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -23996,13 +24063,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 250 text_color: 11711154 } @@ -24012,7 +24079,7 @@ cont { lines { width: 4.4 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -24022,13 +24089,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 11711154 } @@ -24038,7 +24105,7 @@ cont { lines { width: 6.0 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -24048,13 +24115,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 11711154 } @@ -24064,7 +24131,7 @@ cont { lines { width: 9.0 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -24074,13 +24141,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 11711154 } @@ -24090,7 +24157,7 @@ cont { lines { width: 12.0 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -24100,13 +24167,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16342 + priority: 16376 } shield { height: 11 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 350 text_color: 11711154 } @@ -24119,7 +24186,7 @@ cont { lines { width: 0.8 color: 2828327 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -24129,7 +24196,7 @@ cont { lines { width: 1.2 color: 2828327 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -24139,13 +24206,13 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 90 text_color: 11711154 } @@ -24155,7 +24222,7 @@ cont { lines { width: 1.2 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -24165,13 +24232,13 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 120 text_color: 11711154 } @@ -24181,21 +24248,21 @@ cont { lines { width: 1.8 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.6 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -24205,13 +24272,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 175 text_color: 11711154 } @@ -24221,21 +24288,21 @@ cont { lines { width: 3.2 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.4 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.2 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -24245,13 +24312,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 250 text_color: 11711154 } @@ -24261,21 +24328,21 @@ cont { lines { width: 4.4 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.8 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.6 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -24285,13 +24352,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 11711154 } @@ -24301,21 +24368,21 @@ cont { lines { width: 6.0 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 13.6 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 15.2 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -24325,13 +24392,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 11711154 } @@ -24341,21 +24408,21 @@ cont { lines { width: 9.0 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 20.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 22.0 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -24365,13 +24432,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 11711154 } @@ -24381,21 +24448,21 @@ cont { lines { width: 12.0 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 26.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 28.0 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -24405,13 +24472,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16342 + priority: 16376 } shield { height: 11 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 350 text_color: 11711154 } @@ -24424,7 +24491,7 @@ cont { lines { width: 0.8 color: 2828327 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -24434,7 +24501,7 @@ cont { lines { width: 1.2 color: 2828327 - priority: 1342 + priority: 1376 join: BEVELJOIN cap: BUTTCAP } @@ -24444,13 +24511,13 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 90 text_color: 11711154 } @@ -24460,7 +24527,7 @@ cont { lines { width: 1.2 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -24470,13 +24537,13 @@ cont { color: 6710886 stroke_color: 436207616 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 120 text_color: 11711154 } @@ -24486,7 +24553,7 @@ cont { lines { width: 1.8 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -24496,13 +24563,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 175 text_color: 11711154 } @@ -24512,7 +24579,7 @@ cont { lines { width: 3.2 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: BUTTCAP } @@ -24522,13 +24589,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 250 text_color: 11711154 } @@ -24542,14 +24609,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1375 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -24559,13 +24626,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16342 + priority: 16376 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 11711154 } @@ -24579,14 +24646,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1375 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -24596,13 +24663,13 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 11711154 } @@ -24616,14 +24683,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1375 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.0 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -24633,13 +24700,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16342 + priority: 16376 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 300 text_color: 11711154 } @@ -24653,14 +24720,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1341 + priority: 1375 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.0 color: 2828327 - priority: 1342 + priority: 1376 join: ROUNDJOIN cap: ROUNDCAP } @@ -24670,13 +24737,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16342 + priority: 16376 } shield { height: 11 color: 0 stroke_color: 11711154 - priority: 16342 + priority: 16376 min_distance: 350 text_color: 11711154 } @@ -24689,7 +24756,7 @@ cont { lines { width: 3.2 color: 2828327 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: BUTTCAP } @@ -24699,7 +24766,7 @@ cont { lines { width: 4.4 color: 2828327 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } @@ -24709,7 +24776,7 @@ cont { lines { width: 6.0 color: 2828327 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } @@ -24719,7 +24786,7 @@ cont { lines { width: 9.0 color: 2828327 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } @@ -24729,7 +24796,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16333 + priority: 16366 } } element { @@ -24737,7 +24804,7 @@ cont { lines { width: 12.0 color: 2828327 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } @@ -24747,7 +24814,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16333 + priority: 16366 } } } @@ -24758,21 +24825,21 @@ cont { lines { width: 3.2 color: 2828327 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.4 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.2 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -24782,21 +24849,21 @@ cont { lines { width: 4.4 color: 2828327 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.8 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.6 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -24806,21 +24873,21 @@ cont { lines { width: 6.0 color: 2828327 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 13.6 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 15.2 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -24830,21 +24897,21 @@ cont { lines { width: 9.0 color: 2828327 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 20.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 22.0 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -24854,7 +24921,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16333 + priority: 16366 } } element { @@ -24862,21 +24929,21 @@ cont { lines { width: 12.0 color: 2828327 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 26.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 28.0 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -24886,7 +24953,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16333 + priority: 16366 } } } @@ -24897,7 +24964,7 @@ cont { lines { width: 3.2 color: 2828327 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: BUTTCAP } @@ -24911,14 +24978,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1332 + priority: 1365 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 2828327 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } @@ -24932,14 +24999,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1332 + priority: 1365 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 2828327 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } @@ -24953,14 +25020,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1332 + priority: 1365 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.0 color: 2828327 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } @@ -24970,7 +25037,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16333 + priority: 16366 } } element { @@ -24982,14 +25049,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1332 + priority: 1365 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.0 color: 2828327 - priority: 1333 + priority: 1366 join: ROUNDJOIN cap: ROUNDCAP } @@ -24999,7 +25066,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16333 + priority: 16366 } } } @@ -25014,7 +25081,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25028,7 +25095,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25038,7 +25105,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25050,7 +25117,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25060,7 +25127,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25072,7 +25139,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25082,7 +25149,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25094,7 +25161,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25104,7 +25171,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25116,7 +25183,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25126,7 +25193,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -25141,7 +25208,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25155,7 +25222,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25165,7 +25232,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25177,7 +25244,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25187,7 +25254,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25199,7 +25266,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25209,7 +25276,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25221,7 +25288,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25231,7 +25298,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25243,7 +25310,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25253,7 +25320,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -25268,7 +25335,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25282,7 +25349,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25292,7 +25359,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25304,7 +25371,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25314,7 +25381,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25326,7 +25393,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25336,7 +25403,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25348,7 +25415,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25358,7 +25425,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25370,7 +25437,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25380,7 +25447,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -25395,7 +25462,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25409,7 +25476,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25419,7 +25486,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25431,7 +25498,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25441,7 +25508,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25453,7 +25520,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25463,7 +25530,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25475,7 +25542,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25485,7 +25552,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25497,7 +25564,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25507,7 +25574,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -25522,7 +25589,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25536,7 +25603,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25546,7 +25613,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25558,7 +25625,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25568,7 +25635,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25580,7 +25647,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25590,7 +25657,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25602,7 +25669,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25612,7 +25679,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25624,7 +25691,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25634,7 +25701,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -25649,7 +25716,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25663,7 +25730,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25673,7 +25740,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25685,7 +25752,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25695,7 +25762,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25707,7 +25774,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25717,7 +25784,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25729,7 +25796,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25739,7 +25806,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25751,7 +25818,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25761,7 +25828,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -25776,7 +25843,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25790,7 +25857,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25800,7 +25867,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25812,7 +25879,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25822,7 +25889,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25834,7 +25901,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25844,7 +25911,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25856,7 +25923,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25866,7 +25933,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25878,7 +25945,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25888,7 +25955,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -25903,7 +25970,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25917,7 +25984,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -25927,7 +25994,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25939,7 +26006,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25949,7 +26016,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25961,7 +26028,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25971,7 +26038,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -25983,7 +26050,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -25993,7 +26060,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26005,7 +26072,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26015,7 +26082,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -26030,7 +26097,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26044,7 +26111,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26054,7 +26121,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26066,7 +26133,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26076,7 +26143,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26088,7 +26155,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26098,7 +26165,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26110,7 +26177,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26120,7 +26187,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26132,7 +26199,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26142,7 +26209,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -26157,7 +26224,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26171,7 +26238,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26181,7 +26248,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26193,7 +26260,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26203,7 +26270,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26215,7 +26282,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26225,7 +26292,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26237,7 +26304,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26247,7 +26314,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26259,7 +26326,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26269,7 +26336,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -26284,7 +26351,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26298,7 +26365,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26308,7 +26375,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26320,7 +26387,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26330,7 +26397,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26342,7 +26409,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26352,7 +26419,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26364,7 +26431,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26374,7 +26441,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26386,7 +26453,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26396,7 +26463,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -26411,7 +26478,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26425,7 +26492,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26435,7 +26502,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26447,7 +26514,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26457,7 +26524,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26469,7 +26536,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26479,7 +26546,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26491,7 +26558,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26501,7 +26568,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26513,7 +26580,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26523,7 +26590,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -26538,7 +26605,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26552,7 +26619,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26562,7 +26629,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26574,7 +26641,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26584,7 +26651,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26596,7 +26663,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26606,7 +26673,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26618,7 +26685,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26628,7 +26695,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26640,7 +26707,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26650,7 +26717,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -26665,7 +26732,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26679,7 +26746,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26689,7 +26756,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26701,7 +26768,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26711,7 +26778,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26723,7 +26790,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26733,7 +26800,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26745,7 +26812,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26755,7 +26822,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26767,7 +26834,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26777,7 +26844,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -26792,7 +26859,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26806,7 +26873,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26816,7 +26883,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26828,7 +26895,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26838,7 +26905,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26850,7 +26917,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26860,7 +26927,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26872,7 +26939,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26882,7 +26949,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26894,7 +26961,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26904,7 +26971,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -26919,7 +26986,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26933,7 +27000,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -26943,7 +27010,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26955,7 +27022,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26965,7 +27032,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26977,7 +27044,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -26987,7 +27054,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -26999,7 +27066,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -27009,7 +27076,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -27021,7 +27088,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -27031,7 +27098,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -27046,7 +27113,7 @@ cont { dd: 2.52 dd: 1.35 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -27060,7 +27127,7 @@ cont { dd: 2.7 dd: 1.26 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -27070,7 +27137,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -27082,7 +27149,7 @@ cont { dd: 3.6 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -27092,7 +27159,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -27104,7 +27171,7 @@ cont { dd: 4.5 dd: 1.8 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -27114,7 +27181,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -27126,7 +27193,7 @@ cont { dd: 7.2 dd: 2.7 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -27136,7 +27203,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } element { @@ -27148,7 +27215,7 @@ cont { dd: 9.0 dd: 3.6 } - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -27158,7 +27225,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16279 + priority: 16306 } } } @@ -27169,7 +27236,7 @@ cont { lines { width: 0.9 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27179,7 +27246,7 @@ cont { lines { width: 1.1 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27189,7 +27256,7 @@ cont { lines { width: 1.2 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27199,7 +27266,7 @@ cont { lines { width: 1.5 color: 3677972 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27209,13 +27276,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 85 text_color: 11711154 } @@ -27225,7 +27292,7 @@ cont { lines { width: 1.7 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27235,13 +27302,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 11711154 } @@ -27251,7 +27318,7 @@ cont { lines { width: 1.9 color: 3677972 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27261,13 +27328,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 11711154 } @@ -27277,7 +27344,7 @@ cont { lines { width: 2.8 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -27287,13 +27354,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 120 text_color: 11711154 } @@ -27303,7 +27370,7 @@ cont { lines { width: 3.8 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -27313,13 +27380,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 175 text_color: 11711154 } @@ -27329,7 +27396,7 @@ cont { lines { width: 4.8 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -27339,13 +27406,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 250 text_color: 11711154 } @@ -27355,7 +27422,7 @@ cont { lines { width: 6.0 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -27365,13 +27432,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 11711154 } @@ -27381,7 +27448,7 @@ cont { lines { width: 9.0 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -27391,13 +27458,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 11711154 } @@ -27407,7 +27474,7 @@ cont { lines { width: 12.0 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -27417,13 +27484,13 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 11711154 } @@ -27433,7 +27500,7 @@ cont { lines { width: 15.0 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -27443,13 +27510,13 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16396 + priority: 16435 } shield { height: 11 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 350 text_color: 11711154 } @@ -27462,7 +27529,7 @@ cont { lines { width: 0.9 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27472,7 +27539,7 @@ cont { lines { width: 1.1 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27482,7 +27549,7 @@ cont { lines { width: 1.2 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27492,7 +27559,7 @@ cont { lines { width: 1.5 color: 3677972 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27502,13 +27569,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 85 text_color: 11711154 } @@ -27518,7 +27585,7 @@ cont { lines { width: 1.7 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27528,13 +27595,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 11711154 } @@ -27544,7 +27611,7 @@ cont { lines { width: 1.9 color: 3677972 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27554,13 +27621,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 11711154 } @@ -27570,21 +27637,21 @@ cont { lines { width: 2.8 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.4 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -27594,13 +27661,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 120 text_color: 11711154 } @@ -27610,21 +27677,21 @@ cont { lines { width: 3.8 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.6 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -27634,13 +27701,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 175 text_color: 11711154 } @@ -27650,21 +27717,21 @@ cont { lines { width: 4.8 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.6 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 10.4 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -27674,13 +27741,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 250 text_color: 11711154 } @@ -27690,21 +27757,21 @@ cont { lines { width: 6.0 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 12.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.8 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -27714,13 +27781,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 11711154 } @@ -27730,21 +27797,21 @@ cont { lines { width: 9.0 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 19.6 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 21.2 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -27754,13 +27821,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 11711154 } @@ -27770,21 +27837,21 @@ cont { lines { width: 12.0 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 26.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 28.0 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -27794,13 +27861,13 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 11711154 } @@ -27810,21 +27877,21 @@ cont { lines { width: 15.0 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 32.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 34.0 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -27834,13 +27901,13 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16396 + priority: 16435 } shield { height: 11 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 350 text_color: 11711154 } @@ -27853,7 +27920,7 @@ cont { lines { width: 0.9 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27863,7 +27930,7 @@ cont { lines { width: 1.1 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27873,7 +27940,7 @@ cont { lines { width: 1.2 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27883,7 +27950,7 @@ cont { lines { width: 1.5 color: 3677972 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27893,13 +27960,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 85 text_color: 11711154 } @@ -27909,7 +27976,7 @@ cont { lines { width: 1.7 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27919,13 +27986,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 11711154 } @@ -27939,14 +28006,14 @@ cont { dd: 2.0 dd: 2.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.9 color: 3677972 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -27956,13 +28023,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 90 text_color: 11711154 } @@ -27976,14 +28043,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 2.8 color: 3677972 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -27993,13 +28060,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 120 text_color: 11711154 } @@ -28013,14 +28080,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.8 color: 3677972 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -28030,13 +28097,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 175 text_color: 11711154 } @@ -28050,14 +28117,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.8 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: BUTTCAP } @@ -28067,13 +28134,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 250 text_color: 11711154 } @@ -28087,14 +28154,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -28104,13 +28171,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 11711154 } @@ -28124,14 +28191,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.0 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -28141,13 +28208,13 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 11711154 } @@ -28161,14 +28228,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.0 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -28178,13 +28245,13 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16396 + priority: 16435 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 300 text_color: 11711154 } @@ -28198,14 +28265,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1395 + priority: 1434 join: ROUNDJOIN cap: BUTTCAP } lines { width: 15.0 color: 3677969 - priority: 1396 + priority: 1435 join: ROUNDJOIN cap: ROUNDCAP } @@ -28215,13 +28282,13 @@ cont { color: 8947848 stroke_color: 1118464 } - priority: 16396 + priority: 16435 } shield { height: 11 color: 0 stroke_color: 11711154 - priority: 16396 + priority: 16435 min_distance: 350 text_color: 11711154 } @@ -28237,7 +28304,7 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16387 + priority: 16425 } } element { @@ -28248,7 +28315,7 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16387 + priority: 16425 } } element { @@ -28259,7 +28326,7 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16387 + priority: 16425 } } element { @@ -28267,7 +28334,7 @@ cont { lines { width: 1.4 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -28277,13 +28344,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 120 text_color: 11711154 } @@ -28293,7 +28360,7 @@ cont { lines { width: 1.8 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -28303,13 +28370,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 175 text_color: 11711154 } @@ -28319,7 +28386,7 @@ cont { lines { width: 2.4 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -28329,13 +28396,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 250 text_color: 11711154 } @@ -28345,7 +28412,7 @@ cont { lines { width: 3.0 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -28355,13 +28422,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 11711154 } @@ -28371,7 +28438,7 @@ cont { lines { width: 4.5 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -28381,13 +28448,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 11711154 } @@ -28397,7 +28464,7 @@ cont { lines { width: 6.0 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -28407,13 +28474,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 11711154 } @@ -28423,7 +28490,7 @@ cont { lines { width: 7.5 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -28433,13 +28500,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16387 + priority: 16425 } shield { height: 11 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 350 text_color: 11711154 } @@ -28455,7 +28522,7 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16387 + priority: 16425 } } element { @@ -28466,7 +28533,7 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16387 + priority: 16425 } } element { @@ -28477,7 +28544,7 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16387 + priority: 16425 } } element { @@ -28485,7 +28552,7 @@ cont { lines { width: 1.4 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -28495,13 +28562,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 120 text_color: 11711154 } @@ -28511,21 +28578,21 @@ cont { lines { width: 1.8 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.6 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -28535,13 +28602,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 175 text_color: 11711154 } @@ -28551,21 +28618,21 @@ cont { lines { width: 2.4 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.8 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 5.6 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -28575,13 +28642,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 250 text_color: 11711154 } @@ -28591,21 +28658,21 @@ cont { lines { width: 3.0 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 6.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.8 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -28615,13 +28682,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 11711154 } @@ -28631,21 +28698,21 @@ cont { lines { width: 4.5 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 10.6 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.2 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -28655,13 +28722,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 11711154 } @@ -28671,21 +28738,21 @@ cont { lines { width: 6.0 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 14.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 16.0 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -28695,13 +28762,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 11711154 } @@ -28711,21 +28778,21 @@ cont { lines { width: 7.5 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 17.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 19.0 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -28735,13 +28802,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16387 + priority: 16425 } shield { height: 11 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 350 text_color: 11711154 } @@ -28757,7 +28824,7 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16387 + priority: 16425 } } element { @@ -28768,7 +28835,7 @@ cont { color: 8947848 stroke_color: 856756480 } - priority: 16387 + priority: 16425 } } element { @@ -28779,7 +28846,7 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16387 + priority: 16425 } } element { @@ -28791,14 +28858,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.4 color: 3677972 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -28808,13 +28875,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 120 text_color: 11711154 } @@ -28828,14 +28895,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.8 color: 3677972 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -28845,13 +28912,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 175 text_color: 11711154 } @@ -28865,14 +28932,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 2.4 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: BUTTCAP } @@ -28882,13 +28949,13 @@ cont { color: 7829367 stroke_color: 437326080 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 250 text_color: 11711154 } @@ -28902,14 +28969,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -28919,13 +28986,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16387 + priority: 16425 } shield { height: 9 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 11711154 } @@ -28939,14 +29006,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.5 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -28956,13 +29023,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 11711154 } @@ -28976,14 +29043,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -28993,13 +29060,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16387 + priority: 16425 } shield { height: 10 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 300 text_color: 11711154 } @@ -29013,14 +29080,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1386 + priority: 1424 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.5 color: 3677969 - priority: 1387 + priority: 1425 join: ROUNDJOIN cap: ROUNDCAP } @@ -29030,13 +29097,13 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16387 + priority: 16425 } shield { height: 11 color: 0 stroke_color: 11711154 - priority: 16387 + priority: 16425 min_distance: 350 text_color: 11711154 } @@ -29049,7 +29116,7 @@ cont { lines { width: 1.2 color: 2828327 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -29059,7 +29126,7 @@ cont { lines { width: 1.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29069,7 +29136,7 @@ cont { lines { width: 1.8 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29079,7 +29146,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -29087,7 +29154,7 @@ cont { lines { width: 3.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29097,7 +29164,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -29105,7 +29172,7 @@ cont { lines { width: 4.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29115,7 +29182,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -29123,7 +29190,7 @@ cont { lines { width: 6.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29133,7 +29200,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -29141,7 +29208,7 @@ cont { lines { width: 9.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29151,7 +29218,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16324 + priority: 16356 } } element { @@ -29159,7 +29226,7 @@ cont { lines { width: 12.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29169,7 +29236,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16324 + priority: 16356 } } } @@ -29180,7 +29247,7 @@ cont { lines { width: 1.2 color: 2828327 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -29190,7 +29257,7 @@ cont { lines { width: 1.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29200,7 +29267,7 @@ cont { lines { width: 1.8 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29210,7 +29277,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -29218,7 +29285,7 @@ cont { lines { width: 3.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29228,7 +29295,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -29236,7 +29303,7 @@ cont { lines { width: 4.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29246,7 +29313,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -29254,7 +29321,7 @@ cont { lines { width: 6.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29264,7 +29331,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -29272,7 +29339,7 @@ cont { lines { width: 9.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29282,7 +29349,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16324 + priority: 16356 } } element { @@ -29290,7 +29357,7 @@ cont { lines { width: 12.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29300,7 +29367,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16324 + priority: 16356 } } } @@ -29311,7 +29378,7 @@ cont { lines { width: 1.2 color: 2828327 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -29321,7 +29388,7 @@ cont { lines { width: 1.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29331,21 +29398,21 @@ cont { lines { width: 1.8 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.6 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -29355,7 +29422,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -29363,21 +29430,21 @@ cont { lines { width: 3.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.8 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -29387,7 +29454,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -29395,21 +29462,21 @@ cont { lines { width: 4.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.8 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -29419,7 +29486,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -29427,21 +29494,21 @@ cont { lines { width: 6.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 13.6 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 15.2 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -29451,7 +29518,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -29459,21 +29526,21 @@ cont { lines { width: 9.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 20.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 22.0 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -29483,7 +29550,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16324 + priority: 16356 } } element { @@ -29491,21 +29558,21 @@ cont { lines { width: 12.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 26.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 28.0 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -29515,7 +29582,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16324 + priority: 16356 } } } @@ -29526,7 +29593,7 @@ cont { lines { width: 1.2 color: 2828327 - priority: 1324 + priority: 1356 join: BEVELJOIN cap: BUTTCAP } @@ -29536,7 +29603,7 @@ cont { lines { width: 1.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29546,7 +29613,7 @@ cont { lines { width: 1.8 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29556,7 +29623,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -29564,7 +29631,7 @@ cont { lines { width: 3.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: BUTTCAP } @@ -29574,7 +29641,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -29586,14 +29653,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1323 + priority: 1355 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29603,7 +29670,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -29615,14 +29682,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1323 + priority: 1355 join: ROUNDJOIN cap: BUTTCAP } lines { width: 6.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29632,7 +29699,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 16324 + priority: 16356 } } element { @@ -29644,14 +29711,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1323 + priority: 1355 join: ROUNDJOIN cap: BUTTCAP } lines { width: 9.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29661,7 +29728,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16324 + priority: 16356 } } element { @@ -29673,14 +29740,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1323 + priority: 1355 join: ROUNDJOIN cap: BUTTCAP } lines { width: 12.0 color: 2828327 - priority: 1324 + priority: 1356 join: ROUNDJOIN cap: ROUNDCAP } @@ -29690,7 +29757,7 @@ cont { color: 7829367 stroke_color: 1118464 } - priority: 16324 + priority: 16356 } } } @@ -29701,7 +29768,7 @@ cont { lines { width: 0.5 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -29711,7 +29778,7 @@ cont { lines { width: 0.7 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -29721,7 +29788,7 @@ cont { lines { width: 0.7 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -29731,7 +29798,7 @@ cont { lines { width: 0.7 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -29741,7 +29808,7 @@ cont { lines { width: 0.9 color: 3677969 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -29751,7 +29818,7 @@ cont { lines { width: 0.8 color: 3677969 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -29764,7 +29831,7 @@ cont { lines { width: 0.9 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -29774,7 +29841,7 @@ cont { lines { width: 0.7 color: 3677969 - priority: 1396 + priority: 1435 join: BEVELJOIN cap: BUTTCAP } @@ -29784,7 +29851,7 @@ cont { lines { width: 0.9 color: 3677969 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -29794,7 +29861,7 @@ cont { lines { width: 0.8 color: 3677969 - priority: 1378 + priority: 1415 join: BEVELJOIN cap: BUTTCAP } @@ -29806,7 +29873,7 @@ cont { scale: 17 symbol { name: "remains-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -29814,14 +29881,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "remains-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -29829,14 +29896,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "remains-l" - priority: 16594 + priority: 16653 } caption { primary { @@ -29844,7 +29911,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -29854,7 +29921,7 @@ cont { scale: 16 symbol { name: "monument-m" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -29863,14 +29930,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 17 symbol { name: "monument-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -29879,14 +29946,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "monument-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -29895,14 +29962,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "monument-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -29911,7 +29978,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -29921,7 +29988,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16909 + priority: 16900 min_distance: 12 } caption { @@ -29930,14 +29997,14 @@ cont { color: 5592405 offset_y: 6 } - priority: 15909 + priority: 15900 } } element { scale: 13 symbol { name: "remains-s" - priority: 16909 + priority: 16900 min_distance: 12 } caption { @@ -29946,14 +30013,14 @@ cont { color: 5592405 offset_y: 6 } - priority: 15909 + priority: 15900 } } element { scale: 14 symbol { name: "remains-s" - priority: 16909 + priority: 16900 min_distance: 12 } caption { @@ -29962,14 +30029,14 @@ cont { color: 5592405 offset_y: 6 } - priority: 15909 + priority: 15900 } } element { scale: 15 symbol { name: "remains-m" - priority: 16909 + priority: 16900 min_distance: 5 } caption { @@ -29978,14 +30045,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15909 + priority: 15900 } } element { scale: 16 symbol { name: "remains-m" - priority: 16909 + priority: 16900 } caption { primary { @@ -29993,14 +30060,14 @@ cont { color: 5592405 offset_y: 12 } - priority: 15909 + priority: 15900 } } element { scale: 17 symbol { name: "remains-l" - priority: 16909 + priority: 16900 } caption { primary { @@ -30008,14 +30075,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15909 + priority: 15900 } } element { scale: 18 symbol { name: "remains-l" - priority: 16909 + priority: 16900 } caption { primary { @@ -30023,14 +30090,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15909 + priority: 15900 } } element { scale: 19 symbol { name: "remains-l" - priority: 16909 + priority: 16900 } caption { primary { @@ -30038,7 +30105,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15909 + priority: 15900 } } } @@ -30053,7 +30120,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -30067,7 +30134,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -30081,7 +30148,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -30095,7 +30162,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -30107,7 +30174,7 @@ cont { scale: 12 symbol { name: "remains-s" - priority: 16909 + priority: 16900 min_distance: 12 } caption { @@ -30116,14 +30183,14 @@ cont { color: 5592405 offset_y: 6 } - priority: 15909 + priority: 15900 } } element { scale: 13 symbol { name: "remains-s" - priority: 16909 + priority: 16900 min_distance: 12 } caption { @@ -30132,14 +30199,14 @@ cont { color: 5592405 offset_y: 6 } - priority: 15909 + priority: 15900 } } element { scale: 14 symbol { name: "remains-s" - priority: 16909 + priority: 16900 min_distance: 12 } caption { @@ -30148,14 +30215,14 @@ cont { color: 5592405 offset_y: 6 } - priority: 15909 + priority: 15900 } } element { scale: 15 symbol { name: "remains-m" - priority: 16909 + priority: 16900 min_distance: 5 } caption { @@ -30164,14 +30231,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15909 + priority: 15900 } } element { scale: 16 symbol { name: "remains-m" - priority: 16909 + priority: 16900 } caption { primary { @@ -30179,14 +30246,14 @@ cont { color: 5592405 offset_y: 12 } - priority: 15909 + priority: 15900 } } element { scale: 17 symbol { name: "remains-l" - priority: 16909 + priority: 16900 } caption { primary { @@ -30194,14 +30261,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15909 + priority: 15900 } } element { scale: 18 symbol { name: "remains-l" - priority: 16909 + priority: 16900 } caption { primary { @@ -30209,14 +30276,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15909 + priority: 15900 } } element { scale: 19 symbol { name: "remains-l" - priority: 16909 + priority: 16900 } caption { primary { @@ -30224,7 +30291,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15909 + priority: 15900 } } } @@ -30234,7 +30301,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 16657 + priority: 16722 min_distance: 24 } caption { @@ -30243,14 +30310,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15657 + priority: 15722 } } element { scale: 16 symbol { name: "monument-m" - priority: 16657 + priority: 16722 min_distance: 12 } caption { @@ -30259,14 +30326,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15657 + priority: 15722 } } element { scale: 17 symbol { name: "monument-l" - priority: 16657 + priority: 16722 } caption { primary { @@ -30274,14 +30341,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15657 + priority: 15722 } } element { scale: 18 symbol { name: "monument-l" - priority: 16657 + priority: 16722 } caption { primary { @@ -30289,14 +30356,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15657 + priority: 15722 } } element { scale: 19 symbol { name: "monument-l" - priority: 16657 + priority: 16722 } caption { primary { @@ -30304,7 +30371,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15657 + priority: 15722 } } } @@ -30314,7 +30381,7 @@ cont { scale: 13 symbol { name: "monument-s" - priority: 16657 + priority: 16722 min_distance: 12 } caption { @@ -30323,14 +30390,14 @@ cont { color: 5592405 offset_y: 6 } - priority: 15657 + priority: 15722 } } element { scale: 14 symbol { name: "monument-s" - priority: 16657 + priority: 16722 min_distance: 12 } caption { @@ -30339,14 +30406,14 @@ cont { color: 5592405 offset_y: 6 } - priority: 15657 + priority: 15722 } } element { scale: 15 symbol { name: "monument-m" - priority: 16657 + priority: 16722 min_distance: 24 } caption { @@ -30355,14 +30422,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15657 + priority: 15722 } } element { scale: 16 symbol { name: "monument-m" - priority: 16657 + priority: 16722 min_distance: 12 } caption { @@ -30371,14 +30438,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15657 + priority: 15722 } } element { scale: 17 symbol { name: "monument-l" - priority: 16657 + priority: 16722 } caption { primary { @@ -30386,14 +30453,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15657 + priority: 15722 } } element { scale: 18 symbol { name: "monument-l" - priority: 16657 + priority: 16722 } caption { primary { @@ -30401,14 +30468,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15657 + priority: 15722 } } element { scale: 19 symbol { name: "monument-l" - priority: 16657 + priority: 16722 } caption { primary { @@ -30416,7 +30483,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15657 + priority: 15722 } } } @@ -30538,7 +30605,7 @@ cont { scale: 16 symbol { name: "historic-ship-m" - priority: 16540 + priority: 16594 min_distance: 8 } caption { @@ -30547,14 +30614,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "historic-ship-l" - priority: 16540 + priority: 16594 min_distance: 8 } caption { @@ -30563,14 +30630,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "historic-ship-l" - priority: 16540 + priority: 16594 min_distance: 8 } caption { @@ -30579,14 +30646,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "historic-ship-l" - priority: 16540 + priority: 16594 min_distance: 8 } caption { @@ -30595,7 +30662,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -30605,7 +30672,7 @@ cont { scale: 16 symbol { name: "tomb-m" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30614,14 +30681,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 17 symbol { name: "tomb-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30630,14 +30697,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "tomb-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30646,14 +30713,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "tomb-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30662,7 +30729,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -30672,7 +30739,7 @@ cont { scale: 16 symbol { name: "monument-m" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30681,14 +30748,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 17 symbol { name: "monument-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30697,14 +30764,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "monument-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30713,14 +30780,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "monument-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30729,7 +30796,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -30739,7 +30806,7 @@ cont { scale: 16 symbol { name: "wayside_shrine-m" - priority: 16531 + priority: 16584 min_distance: 8 } } @@ -30747,7 +30814,7 @@ cont { scale: 17 symbol { name: "wayside_shrine-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30756,14 +30823,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "wayside_shrine-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30772,14 +30839,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "wayside_shrine-l" - priority: 16531 + priority: 16584 min_distance: 8 } caption { @@ -30788,7 +30855,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -30799,7 +30866,7 @@ cont { lines { width: 0 color: 0 - priority: 1423 + priority: 1465 pathsym { name: "arrow-xs" step: 144.0 @@ -30812,7 +30879,7 @@ cont { lines { width: 0 color: 0 - priority: 1423 + priority: 1465 pathsym { name: "arrow-s" step: 144.0 @@ -30825,7 +30892,7 @@ cont { lines { width: 0 color: 0 - priority: 1423 + priority: 1465 pathsym { name: "arrow-s" step: 184.0 @@ -30838,7 +30905,7 @@ cont { lines { width: 0 color: 0 - priority: 1423 + priority: 1465 pathsym { name: "arrow-m" step: 184.0 @@ -30851,7 +30918,7 @@ cont { lines { width: 0 color: 0 - priority: 1423 + priority: 1465 pathsym { name: "arrow-m" step: 184.0 @@ -30866,91 +30933,91 @@ cont { scale: 12 area { color: 988160 - priority: -15910 + priority: -15901 } } element { scale: 13 area { color: 988160 - priority: -15910 + priority: -15901 } } element { scale: 14 area { color: 1251584 - priority: -15910 + priority: -15901 } } element { scale: 15 area { color: 1251584 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 5592405 } - priority: 15090 + priority: 15099 } } element { scale: 16 area { color: 1251584 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 5592405 } - priority: 15090 + priority: 15099 } } element { scale: 17 area { color: 1251584 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 5592405 } - priority: 15090 + priority: 15099 } } element { scale: 18 area { color: 1251584 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 5592405 } - priority: 15090 + priority: 15099 } } element { scale: 19 area { color: 1251584 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 5592405 } - priority: 15090 + priority: 15099 } } } @@ -30960,56 +31027,56 @@ cont { scale: 12 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 13 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 14 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 15 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 16 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 17 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 18 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 19 area { color: 8738 - priority: -15856 + priority: -15842 } } } @@ -31019,18 +31086,18 @@ cont { scale: 14 area { color: 655629312 - priority: -15640 + priority: -15604 } } element { scale: 15 area { color: 1317888 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-m" - priority: 16360 + priority: 16396 } caption { primary { @@ -31038,18 +31105,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 16 area { color: 1317888 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-m" - priority: 16360 + priority: 16396 } caption { primary { @@ -31057,18 +31124,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 17 area { color: 1317888 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -31076,18 +31143,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 18 area { color: 1317888 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -31095,18 +31162,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 19 area { color: 1317888 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -31114,7 +31181,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15360 + priority: 15396 } } } @@ -31124,18 +31191,18 @@ cont { scale: 14 area { color: 655629312 - priority: -15640 + priority: -15604 } } element { scale: 15 area { color: 1317888 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-m" - priority: 16360 + priority: 16396 } caption { primary { @@ -31143,18 +31210,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 16 area { color: 1317888 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-m" - priority: 16360 + priority: 16396 } caption { primary { @@ -31162,18 +31229,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 17 area { color: 1317888 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -31181,18 +31248,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 18 area { color: 1317888 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -31200,18 +31267,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15360 + priority: 15396 } } element { scale: 19 area { color: 1317888 - priority: -15640 + priority: -15604 } symbol { name: "cemetery-l" - priority: 16360 + priority: 16396 } caption { primary { @@ -31219,7 +31286,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15360 + priority: 15396 } } } @@ -31262,70 +31329,70 @@ cont { scale: 15 area { color: 1643545 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 10066329 } - priority: 15027 + priority: 15029 } } element { scale: 16 area { color: 1643545 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 10066329 } - priority: 15027 + priority: 15029 } } element { scale: 17 area { color: 1643545 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 10066329 } - priority: 15027 + priority: 15029 } } element { scale: 18 area { color: 1643545 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 10066329 } - priority: 15027 + priority: 15029 } } element { scale: 19 area { color: 1643545 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 10066329 } - priority: 15027 + priority: 15029 } } } @@ -31335,91 +31402,91 @@ cont { scale: 12 area { color: 988160 - priority: -15910 + priority: -15901 } } element { scale: 13 area { color: 988160 - priority: -15910 + priority: -15901 } } element { scale: 14 area { color: 1251584 - priority: -15910 + priority: -15901 } } element { scale: 15 area { color: 1251584 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 5592405 } - priority: 15090 + priority: 15099 } } element { scale: 16 area { color: 1251584 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 5592405 } - priority: 15090 + priority: 15099 } } element { scale: 17 area { color: 1251584 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 5592405 } - priority: 15090 + priority: 15099 } } element { scale: 18 area { color: 1251584 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 5592405 } - priority: 15090 + priority: 15099 } } element { scale: 19 area { color: 1251584 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 5592405 } - priority: 15090 + priority: 15099 } } } @@ -31429,56 +31496,56 @@ cont { scale: 12 area { color: 988160 - priority: -15910 + priority: -15901 } } element { scale: 13 area { color: 988160 - priority: -15910 + priority: -15901 } } element { scale: 14 area { color: 1251584 - priority: -15910 + priority: -15901 } } element { scale: 15 area { color: 1251584 - priority: -15910 + priority: -15901 } } element { scale: 16 area { color: 1251584 - priority: -15910 + priority: -15901 } } element { scale: 17 area { color: 1251584 - priority: -15910 + priority: -15901 } } element { scale: 18 area { color: 1251584 - priority: -15910 + priority: -15901 } } element { scale: 19 area { color: 1251584 - priority: -15910 + priority: -15901 } } } @@ -31488,39 +31555,39 @@ cont { scale: 10 area { color: 1251584 - priority: -15928 + priority: -15921 } } element { scale: 11 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 12 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 13 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 14 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-s" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -31537,7 +31604,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -31545,7 +31612,7 @@ cont { scale: 14 area { color: 1317888 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -31553,11 +31620,11 @@ cont { scale: 15 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-m" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -31574,7 +31641,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -31582,7 +31649,7 @@ cont { scale: 15 area { color: 1317888 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -31590,11 +31657,11 @@ cont { scale: 16 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-m" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -31611,7 +31678,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -31619,7 +31686,7 @@ cont { scale: 16 area { color: 1317888 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -31627,11 +31694,11 @@ cont { scale: 17 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -31648,7 +31715,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -31656,7 +31723,7 @@ cont { scale: 17 area { color: 1317888 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -31664,11 +31731,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -31685,7 +31752,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -31693,11 +31760,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 } apply_if: "!name" } @@ -31705,11 +31772,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -31726,7 +31793,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -31734,11 +31801,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 } apply_if: "!name" } @@ -31749,39 +31816,39 @@ cont { scale: 10 area { color: 1251584 - priority: -15928 + priority: -15921 } } element { scale: 11 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 12 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 13 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 14 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-s" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -31798,7 +31865,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -31806,7 +31873,7 @@ cont { scale: 14 area { color: 1317888 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -31814,11 +31881,11 @@ cont { scale: 15 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-m" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -31835,7 +31902,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -31843,7 +31910,7 @@ cont { scale: 15 area { color: 1317888 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -31851,11 +31918,11 @@ cont { scale: 16 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-m" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -31872,7 +31939,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -31880,7 +31947,7 @@ cont { scale: 16 area { color: 1317888 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -31888,11 +31955,11 @@ cont { scale: 17 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -31909,7 +31976,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -31917,7 +31984,7 @@ cont { scale: 17 area { color: 1317888 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -31925,11 +31992,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -31946,7 +32013,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -31954,11 +32021,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 } apply_if: "!name" } @@ -31966,11 +32033,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -31987,7 +32054,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -31995,11 +32062,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 } apply_if: "!name" } @@ -32010,39 +32077,39 @@ cont { scale: 10 area { color: 1251584 - priority: -15928 + priority: -15921 } } element { scale: 11 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 12 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 13 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 14 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-s" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32059,7 +32126,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32067,7 +32134,7 @@ cont { scale: 14 area { color: 1317888 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -32075,11 +32142,11 @@ cont { scale: 15 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-m" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32096,7 +32163,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32104,7 +32171,7 @@ cont { scale: 15 area { color: 1317888 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -32112,11 +32179,11 @@ cont { scale: 16 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-m" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32133,7 +32200,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32141,7 +32208,7 @@ cont { scale: 16 area { color: 1317888 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -32149,11 +32216,11 @@ cont { scale: 17 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32170,7 +32237,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32178,7 +32245,7 @@ cont { scale: 17 area { color: 1317888 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -32186,11 +32253,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32207,7 +32274,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32215,11 +32282,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 } apply_if: "!name" } @@ -32227,11 +32294,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32248,7 +32315,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32256,11 +32323,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 } apply_if: "!name" } @@ -32271,39 +32338,39 @@ cont { scale: 10 area { color: 1251584 - priority: -15928 + priority: -15921 } } element { scale: 11 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 12 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 13 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 14 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-s" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32320,7 +32387,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32328,7 +32395,7 @@ cont { scale: 14 area { color: 1317888 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -32336,11 +32403,11 @@ cont { scale: 15 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-m" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32357,7 +32424,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32365,7 +32432,7 @@ cont { scale: 15 area { color: 1317888 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -32373,11 +32440,11 @@ cont { scale: 16 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-m" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32394,7 +32461,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32402,7 +32469,7 @@ cont { scale: 16 area { color: 1317888 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -32410,11 +32477,11 @@ cont { scale: 17 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32431,7 +32498,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32439,7 +32506,7 @@ cont { scale: 17 area { color: 1317888 - priority: -15928 + priority: -15921 } apply_if: "!name" } @@ -32447,11 +32514,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32468,7 +32535,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32476,11 +32543,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 } apply_if: "!name" } @@ -32488,11 +32555,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 min_distance: 10 } caption { @@ -32509,7 +32576,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15072 + priority: 15079 } apply_if: "name" } @@ -32517,11 +32584,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15928 + priority: -15921 } symbol { name: "park-l" - priority: 16072 + priority: 16079 } apply_if: "!name" } @@ -32532,14 +32599,14 @@ cont { scale: 14 area { color: 2149720610 - priority: 1199 + priority: 1218 } } element { scale: 15 area { color: 1713512994 - priority: 1199 + priority: 1218 } } element { @@ -32550,7 +32617,7 @@ cont { width: 1.0 color: 3158064 } - priority: 1199 + priority: 1218 } } element { @@ -32561,7 +32628,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1199 + priority: 1218 } } element { @@ -32572,7 +32639,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1199 + priority: 1218 } } element { @@ -32583,7 +32650,7 @@ cont { width: 1.0 color: 4671303 } - priority: 1199 + priority: 1218 } } } @@ -32593,56 +32660,56 @@ cont { scale: 12 area { color: 988160 - priority: -15874 + priority: -15862 } } element { scale: 13 area { color: 988160 - priority: -15874 + priority: -15862 } } element { scale: 14 area { color: 1251584 - priority: -15874 + priority: -15862 } } element { scale: 15 area { color: 1251584 - priority: -15874 + priority: -15862 } } element { scale: 16 area { color: 1251584 - priority: -15874 + priority: -15862 } } element { scale: 17 area { color: 1251584 - priority: -15874 + priority: -15862 } } element { scale: 18 area { color: 1251584 - priority: -15874 + priority: -15862 } } element { scale: 19 area { color: 1251584 - priority: -15874 + priority: -15862 } } } @@ -32652,70 +32719,70 @@ cont { scale: 15 area { color: 1643545 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 10066329 } - priority: 15027 + priority: 15029 } } element { scale: 16 area { color: 1643545 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 10066329 } - priority: 15027 + priority: 15029 } } element { scale: 17 area { color: 1643545 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 10066329 } - priority: 15027 + priority: 15029 } } element { scale: 18 area { color: 1643545 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 10066329 } - priority: 15027 + priority: 15029 } } element { scale: 19 area { color: 1643545 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 10066329 } - priority: 15027 + priority: 15029 } } } @@ -32725,11 +32792,11 @@ cont { scale: 15 area { color: 1643545 - priority: -15433 + priority: -15377 } symbol { name: "recycling-m" - priority: 16567 + priority: 16623 } caption { primary { @@ -32737,18 +32804,18 @@ cont { color: 5592405 offset_y: 8 } - priority: 15567 + priority: 15623 } } element { scale: 16 area { color: 1643545 - priority: -15433 + priority: -15377 } symbol { name: "recycling-m" - priority: 16567 + priority: 16623 } caption { primary { @@ -32756,18 +32823,18 @@ cont { color: 5592405 offset_y: 8 } - priority: 15567 + priority: 15623 } } element { scale: 17 area { color: 1643545 - priority: -15433 + priority: -15377 } symbol { name: "recycling-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -32775,18 +32842,18 @@ cont { color: 5592405 offset_y: 8 } - priority: 15567 + priority: 15623 } } element { scale: 18 area { color: 1643545 - priority: -15433 + priority: -15377 } symbol { name: "recycling-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -32794,18 +32861,18 @@ cont { color: 5592405 offset_y: 8 } - priority: 15567 + priority: 15623 } } element { scale: 19 area { color: 1643545 - priority: -15433 + priority: -15377 } symbol { name: "recycling-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -32813,7 +32880,7 @@ cont { color: 5592405 offset_y: 8 } - priority: 15567 + priority: 15623 } } } @@ -32823,56 +32890,56 @@ cont { scale: 12 area { color: 988160 - priority: -15910 + priority: -15901 } } element { scale: 13 area { color: 988160 - priority: -15910 + priority: -15901 } } element { scale: 14 area { color: 1251584 - priority: -15910 + priority: -15901 } } element { scale: 15 area { color: 1251584 - priority: -15910 + priority: -15901 } } element { scale: 16 area { color: 1251584 - priority: -15910 + priority: -15901 } } element { scale: 17 area { color: 1251584 - priority: -15910 + priority: -15901 } } element { scale: 18 area { color: 1251584 - priority: -15910 + priority: -15901 } } element { scale: 19 area { color: 1251584 - priority: -15910 + priority: -15901 } } } @@ -32882,25 +32949,25 @@ cont { scale: 14 area { color: 12000284 - priority: -15577 + priority: -15535 } } element { scale: 15 area { color: 12000284 - priority: -15577 + priority: -15535 } } element { scale: 16 area { color: 12000284 - priority: -15577 + priority: -15535 } symbol { name: "military-m" - priority: 16423 + priority: 16465 min_distance: 10 } } @@ -32908,11 +32975,11 @@ cont { scale: 17 area { color: 12000284 - priority: -15577 + priority: -15535 } symbol { name: "military-l" - priority: 16423 + priority: 16465 } caption { primary { @@ -32920,18 +32987,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15423 + priority: 15465 } } element { scale: 18 area { color: 12000284 - priority: -15577 + priority: -15535 } symbol { name: "military-l" - priority: 16423 + priority: 16465 } caption { primary { @@ -32939,18 +33006,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15423 + priority: 15465 } } element { scale: 19 area { color: 12000284 - priority: -15577 + priority: -15535 } symbol { name: "military-l" - priority: 16423 + priority: 16465 } caption { primary { @@ -32958,7 +33025,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15423 + priority: 15465 } } } @@ -32968,91 +33035,91 @@ cont { scale: 12 area { color: 988160 - priority: -15910 + priority: -15901 } } element { scale: 13 area { color: 988160 - priority: -15910 + priority: -15901 } } element { scale: 14 area { color: 1251584 - priority: -15910 + priority: -15901 } } element { scale: 15 area { color: 1251584 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 5592405 } - priority: 15090 + priority: 15099 } } element { scale: 16 area { color: 1251584 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 5592405 } - priority: 15090 + priority: 15099 } } element { scale: 17 area { color: 1251584 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 5592405 } - priority: 15090 + priority: 15099 } } element { scale: 18 area { color: 1251584 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 5592405 } - priority: 15090 + priority: 15099 } } element { scale: 19 area { color: 1251584 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 5592405 } - priority: 15090 + priority: 15099 } } } @@ -33062,70 +33129,70 @@ cont { scale: 15 area { color: 1643545 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 10066329 } - priority: 15027 + priority: 15029 } } element { scale: 16 area { color: 1643545 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 10066329 } - priority: 15027 + priority: 15029 } } element { scale: 17 area { color: 1643545 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 10066329 } - priority: 15027 + priority: 15029 } } element { scale: 18 area { color: 1643545 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 10066329 } - priority: 15027 + priority: 15029 } } element { scale: 19 area { color: 1643545 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 10066329 } - priority: 15027 + priority: 15029 } } } @@ -33135,70 +33202,70 @@ cont { scale: 15 area { color: 1643545 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 10066329 } - priority: 15027 + priority: 15029 } } element { scale: 16 area { color: 1643545 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 10066329 } - priority: 15027 + priority: 15029 } } element { scale: 17 area { color: 1643545 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 10066329 } - priority: 15027 + priority: 15029 } } element { scale: 18 area { color: 1643545 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 10066329 } - priority: 15027 + priority: 15029 } } element { scale: 19 area { color: 1643545 - priority: -15973 + priority: -15971 } caption { primary { height: 10 color: 10066329 } - priority: 15027 + priority: 15029 } } } @@ -33208,91 +33275,91 @@ cont { scale: 12 area { color: 988160 - priority: -15910 + priority: -15901 } } element { scale: 13 area { color: 988160 - priority: -15910 + priority: -15901 } } element { scale: 14 area { color: 1251584 - priority: -15910 + priority: -15901 } } element { scale: 15 area { color: 1251584 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 5592405 } - priority: 15090 + priority: 15099 } } element { scale: 16 area { color: 1251584 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 5592405 } - priority: 15090 + priority: 15099 } } element { scale: 17 area { color: 1251584 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 5592405 } - priority: 15090 + priority: 15099 } } element { scale: 18 area { color: 1251584 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 5592405 } - priority: 15090 + priority: 15099 } } element { scale: 19 area { color: 1251584 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 5592405 } - priority: 15090 + priority: 15099 } } } @@ -33305,7 +33372,7 @@ cont { height: 9 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33316,7 +33383,7 @@ cont { height: 9 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33324,14 +33391,14 @@ cont { scale: 12 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33339,7 +33406,7 @@ cont { scale: 12 area { color: 8738 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -33347,14 +33414,14 @@ cont { scale: 13 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33362,7 +33429,7 @@ cont { scale: 13 area { color: 8738 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -33370,14 +33437,14 @@ cont { scale: 14 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33385,7 +33452,7 @@ cont { scale: 14 area { color: 8738 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -33393,14 +33460,14 @@ cont { scale: 15 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33408,7 +33475,7 @@ cont { scale: 15 area { color: 8738 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -33416,14 +33483,14 @@ cont { scale: 16 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33431,7 +33498,7 @@ cont { scale: 16 area { color: 8738 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -33439,14 +33506,14 @@ cont { scale: 17 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33454,7 +33521,7 @@ cont { scale: 17 area { color: 8738 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -33462,14 +33529,14 @@ cont { scale: 18 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33477,7 +33544,7 @@ cont { scale: 18 area { color: 8738 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -33485,14 +33552,14 @@ cont { scale: 19 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -33500,7 +33567,7 @@ cont { scale: 19 area { color: 8738 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -33511,140 +33578,140 @@ cont { scale: 0 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 1 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 2 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 3 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 4 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 5 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 6 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 7 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 8 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 9 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 10 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 11 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 12 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 13 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 14 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 15 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 16 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 17 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 18 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 19 area { color: 8738 - priority: -15856 + priority: -15842 } } } @@ -33654,56 +33721,56 @@ cont { scale: 12 area { color: 988160 - priority: -15910 + priority: -15901 } } element { scale: 13 area { color: 988160 - priority: -15910 + priority: -15901 } } element { scale: 14 area { color: 1251584 - priority: -15910 + priority: -15901 } } element { scale: 15 area { color: 1251584 - priority: -15910 + priority: -15901 } } element { scale: 16 area { color: 1251584 - priority: -15910 + priority: -15901 } } element { scale: 17 area { color: 1251584 - priority: -15910 + priority: -15901 } } element { scale: 18 area { color: 1251584 - priority: -15910 + priority: -15901 } } element { scale: 19 area { color: 1251584 - priority: -15910 + priority: -15901 } } } @@ -33713,91 +33780,91 @@ cont { scale: 12 area { color: 988160 - priority: -15910 + priority: -15901 } } element { scale: 13 area { color: 988160 - priority: -15910 + priority: -15901 } } element { scale: 14 area { color: 1251584 - priority: -15910 + priority: -15901 } } element { scale: 15 area { color: 1251584 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 5592405 } - priority: 15090 + priority: 15099 } } element { scale: 16 area { color: 1251584 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 5592405 } - priority: 15090 + priority: 15099 } } element { scale: 17 area { color: 1251584 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 5592405 } - priority: 15090 + priority: 15099 } } element { scale: 18 area { color: 1251584 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 5592405 } - priority: 15090 + priority: 15099 } } element { scale: 19 area { color: 1251584 - priority: -15910 + priority: -15901 } caption { primary { height: 10 color: 5592405 } - priority: 15090 + priority: 15099 } } } @@ -33811,7 +33878,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -33822,7 +33889,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -33833,7 +33900,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -33843,7 +33910,7 @@ cont { scale: 16 symbol { name: "dog_park-m" - priority: 16540 + priority: 16594 min_distance: 30 } caption { @@ -33852,14 +33919,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "dog_park-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -33868,14 +33935,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "dog_park-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -33884,14 +33951,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "dog_park-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -33900,7 +33967,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -33910,7 +33977,7 @@ cont { scale: 16 symbol { name: "dog_park-m" - priority: 16540 + priority: 16594 min_distance: 30 } caption { @@ -33919,14 +33986,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "dog_park-l" - priority: 16567 + priority: 16623 min_distance: 20 } caption { @@ -33935,14 +34002,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 18 symbol { name: "dog_park-l" - priority: 16567 + priority: 16623 min_distance: 20 } caption { @@ -33951,14 +34018,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "dog_park-l" - priority: 16567 + priority: 16623 min_distance: 20 } caption { @@ -33967,7 +34034,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -33978,7 +34045,7 @@ cont { symbol { name: "gym-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -33995,7 +34062,7 @@ cont { symbol { name: "gym-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -34012,7 +34079,7 @@ cont { symbol { name: "gym-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -34031,39 +34098,39 @@ cont { scale: 12 area { color: 1317888 - priority: -15919 + priority: -15911 } } element { scale: 13 area { color: 1317888 - priority: -15919 + priority: -15911 } } element { scale: 14 area { color: 1317888 - priority: -15919 + priority: -15911 } } element { scale: 15 area { color: 1317888 - priority: -15919 + priority: -15911 } } element { scale: 16 area { color: 1317888 - priority: -15919 + priority: -15911 } symbol { name: "garden-m" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -34080,7 +34147,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -34088,7 +34155,7 @@ cont { scale: 16 area { color: 1317888 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -34096,11 +34163,11 @@ cont { scale: 17 area { color: 1317888 - priority: -15955 + priority: -15951 } symbol { name: "garden-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -34117,7 +34184,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -34125,7 +34192,7 @@ cont { scale: 17 area { color: 1317888 - priority: -15955 + priority: -15951 } caption { primary { @@ -34133,7 +34200,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -34141,11 +34208,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15955 + priority: -15951 } symbol { name: "garden-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -34162,7 +34229,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -34170,11 +34237,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15955 + priority: -15951 } symbol { name: "garden-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -34191,7 +34258,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -34202,46 +34269,46 @@ cont { scale: 12 area { color: 988160 - priority: -15874 + priority: -15862 } } element { scale: 13 area { color: 988160 - priority: -15874 + priority: -15862 } } element { scale: 14 area { color: 1251584 - priority: -15874 + priority: -15862 } } element { scale: 15 area { color: 1251584 - priority: -15874 + priority: -15862 } } element { scale: 16 area { color: 1251584 - priority: -15874 + priority: -15862 } } element { scale: 17 area { color: 1251584 - priority: -15865 + priority: -15852 } symbol { name: "golf-l" - priority: 16135 + priority: 16148 min_distance: 10 } caption { @@ -34250,18 +34317,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15135 + priority: 15148 } } element { scale: 18 area { color: 1251584 - priority: -15865 + priority: -15852 } symbol { name: "golf-l" - priority: 16135 + priority: 16148 min_distance: 10 } caption { @@ -34270,18 +34337,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15135 + priority: 15148 } } element { scale: 19 area { color: 1251584 - priority: -15865 + priority: -15852 } symbol { name: "golf-l" - priority: 16135 + priority: 16148 min_distance: 10 } caption { @@ -34290,7 +34357,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15135 + priority: 15148 } } } @@ -34304,7 +34371,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -34315,7 +34382,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -34326,7 +34393,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -34336,7 +34403,7 @@ cont { scale: 11 symbol { name: "nparkf-s" - priority: 16603 + priority: 16663 min_distance: 20 } } @@ -34344,7 +34411,7 @@ cont { scale: 12 symbol { name: "nparkf-s" - priority: 16603 + priority: 16663 min_distance: 12 } caption { @@ -34354,14 +34421,14 @@ cont { stroke_color: 856756480 offset_y: 6 } - priority: 15603 + priority: 15663 } } element { scale: 13 symbol { name: "nparkf-s" - priority: 16603 + priority: 16663 min_distance: 12 } caption { @@ -34371,18 +34438,18 @@ cont { stroke_color: 856756480 offset_y: 6 } - priority: 15603 + priority: 15663 } } element { scale: 14 area { color: 1844736 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-s" - priority: 16603 + priority: 16663 } caption { primary { @@ -34391,18 +34458,18 @@ cont { stroke_color: 856756480 offset_y: 8 } - priority: 15603 + priority: 15663 } } element { scale: 15 area { color: 1844736 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-m" - priority: 16603 + priority: 16663 } caption { primary { @@ -34411,18 +34478,18 @@ cont { stroke_color: 437326080 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 16 area { color: 1844736 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-m" - priority: 16603 + priority: 16663 } caption { primary { @@ -34431,18 +34498,18 @@ cont { stroke_color: 437326080 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 17 area { color: 1844736 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -34451,18 +34518,18 @@ cont { stroke_color: 437326080 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 18 area { color: 1844736 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -34471,18 +34538,18 @@ cont { stroke_color: 437326080 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 19 area { color: 1844736 - priority: -15397 + priority: -15337 } symbol { name: "nparkf-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -34491,7 +34558,7 @@ cont { stroke_color: 437326080 offset_y: 10 } - priority: 15603 + priority: 15663 } } } @@ -34501,39 +34568,39 @@ cont { scale: 10 area { color: 1317888 - priority: -15919 + priority: -15911 } } element { scale: 11 area { color: 1317888 - priority: -15919 + priority: -15911 } } element { scale: 12 area { color: 1317888 - priority: -15919 + priority: -15911 } } element { scale: 13 area { color: 1317888 - priority: -15919 + priority: -15911 } } element { scale: 14 area { color: 1317888 - priority: -15919 + priority: -15911 } symbol { name: "park-s" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -34550,7 +34617,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -34558,7 +34625,7 @@ cont { scale: 14 area { color: 1317888 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -34566,11 +34633,11 @@ cont { scale: 15 area { color: 1317888 - priority: -15919 + priority: -15911 } symbol { name: "park-m" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -34587,7 +34654,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -34595,7 +34662,7 @@ cont { scale: 15 area { color: 1317888 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -34603,11 +34670,11 @@ cont { scale: 16 area { color: 1317888 - priority: -15919 + priority: -15911 } symbol { name: "park-m" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -34624,7 +34691,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -34632,7 +34699,7 @@ cont { scale: 16 area { color: 1317888 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -34640,11 +34707,11 @@ cont { scale: 17 area { color: 1317888 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -34661,7 +34728,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -34669,7 +34736,7 @@ cont { scale: 17 area { color: 1317888 - priority: -15955 + priority: -15951 } caption { primary { @@ -34677,7 +34744,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -34685,11 +34752,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -34706,7 +34773,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -34714,11 +34781,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 } caption { primary { @@ -34726,7 +34793,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -34734,11 +34801,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -34755,7 +34822,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -34763,11 +34830,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 } caption { primary { @@ -34775,7 +34842,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -34786,39 +34853,39 @@ cont { scale: 10 area { color: 1317888 - priority: -15919 + priority: -15911 } } element { scale: 11 area { color: 1317888 - priority: -15919 + priority: -15911 } } element { scale: 12 area { color: 1317888 - priority: -15919 + priority: -15911 } } element { scale: 13 area { color: 1317888 - priority: -15919 + priority: -15911 } } element { scale: 14 area { color: 1317888 - priority: -15919 + priority: -15911 } symbol { name: "park-s" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -34835,7 +34902,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -34843,7 +34910,7 @@ cont { scale: 14 area { color: 1317888 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -34851,11 +34918,11 @@ cont { scale: 15 area { color: 1317888 - priority: -15919 + priority: -15911 } symbol { name: "park-m" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -34872,7 +34939,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -34880,7 +34947,7 @@ cont { scale: 15 area { color: 1317888 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -34888,11 +34955,11 @@ cont { scale: 16 area { color: 1317888 - priority: -15919 + priority: -15911 } symbol { name: "park-m" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -34909,7 +34976,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -34917,7 +34984,7 @@ cont { scale: 16 area { color: 1317888 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -34925,11 +34992,11 @@ cont { scale: 17 area { color: 1317888 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -34946,7 +35013,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -34954,7 +35021,7 @@ cont { scale: 17 area { color: 1317888 - priority: -15955 + priority: -15951 } caption { primary { @@ -34962,7 +35029,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -34970,11 +35037,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -34991,7 +35058,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -34999,11 +35066,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 } caption { primary { @@ -35011,7 +35078,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -35019,11 +35086,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35040,7 +35107,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -35048,11 +35115,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 } caption { primary { @@ -35060,7 +35127,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -35071,39 +35138,39 @@ cont { scale: 10 area { color: 1317888 - priority: -15919 + priority: -15911 } } element { scale: 11 area { color: 1317888 - priority: -15919 + priority: -15911 } } element { scale: 12 area { color: 1317888 - priority: -15919 + priority: -15911 } } element { scale: 13 area { color: 1317888 - priority: -15919 + priority: -15911 } } element { scale: 14 area { color: 1317888 - priority: -15919 + priority: -15911 } symbol { name: "park-s" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -35120,7 +35187,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -35128,7 +35195,7 @@ cont { scale: 14 area { color: 1317888 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -35136,11 +35203,11 @@ cont { scale: 15 area { color: 1317888 - priority: -15919 + priority: -15911 } symbol { name: "park-m" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -35157,7 +35224,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -35165,7 +35232,7 @@ cont { scale: 15 area { color: 1317888 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -35173,11 +35240,11 @@ cont { scale: 16 area { color: 1317888 - priority: -15919 + priority: -15911 } symbol { name: "park-m" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -35194,7 +35261,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -35202,7 +35269,7 @@ cont { scale: 16 area { color: 1317888 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -35210,11 +35277,11 @@ cont { scale: 17 area { color: 1317888 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35231,7 +35298,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -35239,7 +35306,7 @@ cont { scale: 17 area { color: 1317888 - priority: -15955 + priority: -15951 } caption { primary { @@ -35247,7 +35314,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -35255,11 +35322,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35276,7 +35343,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -35284,11 +35351,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 } caption { primary { @@ -35296,7 +35363,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -35304,11 +35371,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35325,7 +35392,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -35333,11 +35400,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 } caption { primary { @@ -35345,7 +35412,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -35356,39 +35423,39 @@ cont { scale: 10 area { color: 1317888 - priority: -15919 + priority: -15911 } } element { scale: 11 area { color: 1317888 - priority: -15919 + priority: -15911 } } element { scale: 12 area { color: 1317888 - priority: -15919 + priority: -15911 } } element { scale: 13 area { color: 1317888 - priority: -15919 + priority: -15911 } } element { scale: 14 area { color: 1317888 - priority: -15919 + priority: -15911 } symbol { name: "park-s" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -35405,7 +35472,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -35413,7 +35480,7 @@ cont { scale: 14 area { color: 1317888 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -35421,11 +35488,11 @@ cont { scale: 15 area { color: 1317888 - priority: -15919 + priority: -15911 } symbol { name: "park-m" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -35442,7 +35509,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -35450,7 +35517,7 @@ cont { scale: 15 area { color: 1317888 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -35458,11 +35525,11 @@ cont { scale: 16 area { color: 1317888 - priority: -15919 + priority: -15911 } symbol { name: "park-m" - priority: 16081 + priority: 16089 min_distance: 10 } caption { @@ -35479,7 +35546,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15081 + priority: 15089 } apply_if: "name" } @@ -35487,7 +35554,7 @@ cont { scale: 16 area { color: 1317888 - priority: -15919 + priority: -15911 } apply_if: "!name" } @@ -35495,11 +35562,11 @@ cont { scale: 17 area { color: 1317888 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35516,7 +35583,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -35524,7 +35591,7 @@ cont { scale: 17 area { color: 1317888 - priority: -15955 + priority: -15951 } caption { primary { @@ -35532,7 +35599,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -35540,11 +35607,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35561,7 +35628,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -35569,11 +35636,11 @@ cont { scale: 18 area { color: 1317888 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 } caption { primary { @@ -35581,7 +35648,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -35589,11 +35656,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35610,7 +35677,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15045 + priority: 15049 } apply_if: "name" } @@ -35618,11 +35685,11 @@ cont { scale: 19 area { color: 1317888 - priority: -15955 + priority: -15951 } symbol { name: "park-l" - priority: 16045 + priority: 16049 } caption { primary { @@ -35630,7 +35697,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } apply_if: "!name" } @@ -35641,26 +35708,26 @@ cont { scale: 15 area { color: 2171163 - priority: -15964 + priority: -15961 } } element { scale: 16 area { color: 2171163 - priority: -15964 + priority: -15961 } } element { scale: 17 area { color: 2171163 - priority: -15955 + priority: -15951 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35676,12 +35743,12 @@ cont { scale: 18 area { color: 2171163 - priority: -15955 + priority: -15951 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35697,12 +35764,12 @@ cont { scale: 19 area { color: 2171163 - priority: -15955 + priority: -15951 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -35721,26 +35788,26 @@ cont { scale: 15 area { color: 2171163 - priority: -15460 + priority: -15406 } } element { scale: 16 area { color: 2171163 - priority: -15460 + priority: -15406 } } element { scale: 17 area { color: 2171163 - priority: -15433 + priority: -15377 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -35756,12 +35823,12 @@ cont { scale: 18 area { color: 2171163 - priority: -15433 + priority: -15377 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -35777,12 +35844,12 @@ cont { scale: 19 area { color: 2171163 - priority: -15433 + priority: -15377 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -35801,12 +35868,12 @@ cont { scale: 17 area { color: 2171163 - priority: -15460 + priority: -15406 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -35815,19 +35882,19 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 area { color: 2171163 - priority: -15460 + priority: -15406 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -35836,19 +35903,19 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 area { color: 2171163 - priority: -15460 + priority: -15406 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -35857,7 +35924,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -35867,12 +35934,12 @@ cont { scale: 17 area { color: 2171163 - priority: -15433 + priority: -15377 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -35881,19 +35948,19 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 18 area { color: 2171163 - priority: -15433 + priority: -15377 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -35902,19 +35969,19 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 area { color: 2171163 - priority: -15433 + priority: -15377 } symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -35923,7 +35990,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -35934,7 +36001,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -35943,7 +36010,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { @@ -35951,7 +36018,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -35960,7 +36027,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { @@ -35968,7 +36035,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -35977,7 +36044,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -35991,7 +36058,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -36002,7 +36069,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -36013,7 +36080,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -36024,7 +36091,7 @@ cont { symbol { name: "sauna-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -36041,7 +36108,7 @@ cont { symbol { name: "sauna-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -36058,7 +36125,7 @@ cont { symbol { name: "sauna-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -36081,7 +36148,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -36092,7 +36159,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -36103,7 +36170,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -36114,7 +36181,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -36131,7 +36198,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -36148,7 +36215,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16045 + priority: 16049 min_distance: 10 } caption { @@ -36168,7 +36235,7 @@ cont { symbol { name: "climbing-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -36185,7 +36252,7 @@ cont { symbol { name: "climbing-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -36202,7 +36269,7 @@ cont { symbol { name: "climbing-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -36221,7 +36288,7 @@ cont { scale: 17 symbol { name: "archery-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -36237,7 +36304,7 @@ cont { scale: 18 symbol { name: "archery-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -36253,7 +36320,7 @@ cont { scale: 19 symbol { name: "archery-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -36273,7 +36340,7 @@ cont { symbol { name: "swimming-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -36290,7 +36357,7 @@ cont { symbol { name: "swimming-l" apply_for_type: 1 - priority: 16558 + priority: 16613 min_distance: 10 } caption { @@ -36307,7 +36374,7 @@ cont { symbol { name: "swimming-l" apply_for_type: 1 - priority: 16558 + priority: 16613 min_distance: 10 } caption { @@ -36327,7 +36394,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -36344,7 +36411,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -36361,7 +36428,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -36381,7 +36448,7 @@ cont { symbol { name: "stadium-s" apply_for_type: 1 - priority: 16882 + priority: 16871 min_distance: 16 } caption { @@ -36390,7 +36457,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15882 + priority: 15871 } } element { @@ -36398,7 +36465,7 @@ cont { symbol { name: "stadium-s" apply_for_type: 1 - priority: 16882 + priority: 16871 min_distance: 16 } caption { @@ -36407,19 +36474,19 @@ cont { color: 5592405 offset_y: 10 } - priority: 15882 + priority: 15871 } } element { scale: 15 area { color: 2171163 - priority: -15118 + priority: -15129 } symbol { name: "stadium-m" apply_for_type: 1 - priority: 16882 + priority: 16871 min_distance: 8 } caption { @@ -36428,19 +36495,19 @@ cont { color: 5592405 offset_y: 10 } - priority: 15882 + priority: 15871 } } element { scale: 16 area { color: 2171163 - priority: -15118 + priority: -15129 } symbol { name: "stadium-m" apply_for_type: 1 - priority: 16882 + priority: 16871 min_distance: 8 } caption { @@ -36449,19 +36516,19 @@ cont { color: 5592405 offset_y: 10 } - priority: 15882 + priority: 15871 } } element { scale: 17 area { color: 2171163 - priority: -15118 + priority: -15129 } symbol { name: "stadium-l" apply_for_type: 1 - priority: 16882 + priority: 16871 min_distance: 8 } caption { @@ -36470,19 +36537,19 @@ cont { color: 5592405 offset_y: 10 } - priority: 15882 + priority: 15871 } } element { scale: 18 area { color: 2171163 - priority: -15118 + priority: -15129 } symbol { name: "stadium-l" apply_for_type: 1 - priority: 16882 + priority: 16871 min_distance: 8 } caption { @@ -36491,19 +36558,19 @@ cont { color: 5592405 offset_y: 10 } - priority: 15882 + priority: 15871 } } element { scale: 19 area { color: 2171163 - priority: -15118 + priority: -15129 } symbol { name: "stadium-l" apply_for_type: 1 - priority: 16882 + priority: 16871 min_distance: 8 } caption { @@ -36512,7 +36579,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15882 + priority: 15871 } } } @@ -36522,39 +36589,39 @@ cont { scale: 13 area { color: 8738 - priority: -15406 + priority: -15347 } } element { scale: 14 area { color: 8738 - priority: -15406 + priority: -15347 } } element { scale: 15 area { color: 8738 - priority: -15406 + priority: -15347 } } element { scale: 16 area { color: 8738 - priority: -15406 + priority: -15347 } } element { scale: 17 area { color: 8738 - priority: -15406 + priority: -15347 } symbol { name: "swimming-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -36563,18 +36630,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 area { color: 8738 - priority: -15406 + priority: -15347 } symbol { name: "swimming-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -36583,18 +36650,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 area { color: 8738 - priority: -15406 + priority: -15347 } symbol { name: "swimming-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -36603,7 +36670,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -36614,7 +36681,7 @@ cont { lines { width: 1.0 color: 2828327 - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -36624,7 +36691,7 @@ cont { lines { width: 1.5 color: 2828327 - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: BUTTCAP } @@ -36634,7 +36701,7 @@ cont { lines { width: 1.8 color: 2828327 - priority: 1279 + priority: 1306 join: ROUNDJOIN cap: ROUNDCAP } @@ -36644,7 +36711,7 @@ cont { color: 7829367 stroke_color: 856756480 } - priority: 15279 + priority: 15306 } } element { @@ -36652,7 +36719,7 @@ cont { lines { width: 3.0 color: 2828327 - priority: 1045 + priority: 1049 join: ROUNDJOIN cap: ROUNDCAP } @@ -36663,7 +36730,7 @@ cont { stroke_color: 860111940 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -36671,7 +36738,7 @@ cont { lines { width: 3.0 color: 2828327 - priority: 1045 + priority: 1049 join: ROUNDJOIN cap: ROUNDCAP } @@ -36682,7 +36749,7 @@ cont { stroke_color: 860111940 offset_y: 10 } - priority: 15045 + priority: 15049 } } element { @@ -36690,7 +36757,7 @@ cont { lines { width: 4.0 color: 2828327 - priority: 1045 + priority: 1049 join: ROUNDJOIN cap: ROUNDCAP } @@ -36701,7 +36768,7 @@ cont { stroke_color: 860111940 offset_y: 10 } - priority: 15045 + priority: 15049 } } } @@ -36711,7 +36778,7 @@ cont { scale: 16 symbol { name: "swimming-m" - priority: 16540 + priority: 16594 min_distance: 30 } caption { @@ -36720,14 +36787,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "swimming-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -36736,14 +36803,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "swimming-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -36752,14 +36819,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "swimming-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -36768,7 +36835,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -36778,14 +36845,14 @@ cont { scale: 12 area { color: 0 - priority: -15577 + priority: -15535 } } element { scale: 13 area { color: 0 - priority: -15577 + priority: -15535 } } element { @@ -36796,7 +36863,7 @@ cont { width: 2.0 color: 0 } - priority: -15577 + priority: -15535 } } element { @@ -36807,7 +36874,7 @@ cont { width: 2.0 color: 0 } - priority: -15577 + priority: -15535 } } element { @@ -36818,7 +36885,7 @@ cont { width: 2.0 color: 0 } - priority: -15577 + priority: -15535 } } element { @@ -36836,7 +36903,7 @@ cont { height: 10 color: 5592405 } - priority: 15423 + priority: 15465 } } element { @@ -36854,7 +36921,7 @@ cont { height: 10 color: 5592405 } - priority: 15423 + priority: 15465 } } element { @@ -36872,7 +36939,7 @@ cont { height: 10 color: 5592405 } - priority: 15423 + priority: 15465 } } } @@ -36882,7 +36949,7 @@ cont { scale: 18 symbol { name: "chimney-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -36890,14 +36957,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "chimney-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -36905,7 +36972,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -36919,7 +36986,7 @@ cont { width: 2.0 color: 0 } - priority: -15829 + priority: -15812 } } element { @@ -36930,7 +36997,7 @@ cont { width: 2.0 color: 0 } - priority: -15829 + priority: -15812 } } element { @@ -36941,7 +37008,7 @@ cont { width: 2.0 color: 0 } - priority: -15829 + priority: -15812 } } element { @@ -36952,7 +37019,7 @@ cont { width: 2.0 color: 0 } - priority: -15829 + priority: -15812 } } element { @@ -36963,7 +37030,7 @@ cont { width: 2.0 color: 0 } - priority: -15829 + priority: -15812 } } element { @@ -36974,7 +37041,7 @@ cont { width: 2.0 color: 0 } - priority: -15829 + priority: -15812 } } } @@ -36984,7 +37051,7 @@ cont { scale: 14 symbol { name: "lighthouse-s" - priority: 16603 + priority: 16663 min_distance: 5 } caption { @@ -36993,14 +37060,14 @@ cont { color: 5592405 offset_y: 6 } - priority: 15603 + priority: 15663 } } element { scale: 15 symbol { name: "lighthouse-m" - priority: 16603 + priority: 16663 } caption { primary { @@ -37008,14 +37075,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 16 symbol { name: "lighthouse-m" - priority: 16603 + priority: 16663 } caption { primary { @@ -37023,14 +37090,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 17 symbol { name: "lighthouse-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -37038,14 +37105,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 18 symbol { name: "lighthouse-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -37053,14 +37120,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15603 + priority: 15663 } } element { scale: 19 symbol { name: "lighthouse-l" - priority: 16603 + priority: 16663 } caption { primary { @@ -37068,7 +37135,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15603 + priority: 15663 } } } @@ -37078,14 +37145,14 @@ cont { scale: 12 area { color: 0 - priority: -15577 + priority: -15535 } } element { scale: 13 area { color: 0 - priority: -15577 + priority: -15535 } } element { @@ -37096,7 +37163,7 @@ cont { width: 2.0 color: 0 } - priority: -15577 + priority: -15535 } } element { @@ -37107,7 +37174,7 @@ cont { width: 2.0 color: 0 } - priority: -15577 + priority: -15535 } } element { @@ -37118,7 +37185,7 @@ cont { width: 2.0 color: 0 } - priority: -15577 + priority: -15535 } } element { @@ -37136,7 +37203,7 @@ cont { height: 10 color: 5592405 } - priority: 15423 + priority: 15465 } } element { @@ -37154,7 +37221,7 @@ cont { height: 10 color: 5592405 } - priority: 15423 + priority: 15465 } } element { @@ -37172,7 +37239,7 @@ cont { height: 10 color: 5592405 } - priority: 15423 + priority: 15465 } } } @@ -37182,7 +37249,7 @@ cont { scale: 16 symbol { name: "windmill-m" - priority: 16540 + priority: 16594 min_distance: 30 } caption { @@ -37191,14 +37258,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "windmill-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -37207,14 +37274,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "windmill-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -37223,14 +37290,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "windmill-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -37239,7 +37306,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -37287,112 +37354,112 @@ cont { scale: 10 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 11 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 12 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 13 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 14 area { color: 8738 - priority: -15856 + priority: -15842 } caption { primary { height: 10 color: 19033 } - priority: 15144 + priority: 15158 } } element { scale: 15 area { color: 8738 - priority: -15856 + priority: -15842 } caption { primary { height: 10 color: 19033 } - priority: 15144 + priority: 15158 } } element { scale: 16 area { color: 8738 - priority: -15856 + priority: -15842 } caption { primary { height: 11 color: 19033 } - priority: 15144 + priority: 15158 } } element { scale: 17 area { color: 8738 - priority: -15856 + priority: -15842 } caption { primary { height: 11 color: 19033 } - priority: 15144 + priority: 15158 } } element { scale: 18 area { color: 8738 - priority: -15856 + priority: -15842 } caption { primary { height: 11 color: 19033 } - priority: 15144 + priority: 15158 } } element { scale: 19 area { color: 8738 - priority: -15856 + priority: -15842 } caption { primary { height: 11 color: 19033 } - priority: 15144 + priority: 15158 } } } @@ -37402,60 +37469,60 @@ cont { scale: 10 area { color: 2631706 - priority: -15460 + priority: -15406 } } element { scale: 11 area { color: 2631706 - priority: -15460 + priority: -15406 } } element { scale: 12 area { color: 2631706 - priority: -15460 + priority: -15406 } } element { scale: 13 area { color: 2631706 - priority: -15460 + priority: -15406 } } element { scale: 14 area { color: 2631706 - priority: -15460 + priority: -15406 } } element { scale: 15 area { color: 2631706 - priority: -15460 + priority: -15406 } caption { primary { height: 10 color: 5592405 } - priority: 15540 + priority: 15594 } } element { scale: 16 area { color: 2631706 - priority: -15460 + priority: -15406 } symbol { name: "beach-m" - priority: 16540 + priority: 16594 } caption { primary { @@ -37463,18 +37530,18 @@ cont { color: 5592405 offset_y: 5 } - priority: 15540 + priority: 15594 } } element { scale: 17 area { color: 2631706 - priority: -15460 + priority: -15406 } symbol { name: "beach-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -37482,18 +37549,18 @@ cont { color: 5592405 offset_y: 5 } - priority: 15540 + priority: 15594 } } element { scale: 18 area { color: 2631706 - priority: -15460 + priority: -15406 } symbol { name: "beach-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -37501,18 +37568,18 @@ cont { color: 5592405 offset_y: 5 } - priority: 15540 + priority: 15594 } } element { scale: 19 area { color: 2631706 - priority: -15460 + priority: -15406 } symbol { name: "beach-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -37520,7 +37587,7 @@ cont { color: 5592405 offset_y: 5 } - priority: 15540 + priority: 15594 } } } @@ -37593,7 +37660,7 @@ cont { scale: 11 symbol { name: "cave-s" - priority: 16531 + priority: 16584 min_distance: 20 } caption { @@ -37602,14 +37669,14 @@ cont { color: 5592405 offset_y: 5 } - priority: 15531 + priority: 15584 } } element { scale: 12 symbol { name: "cave-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -37617,14 +37684,14 @@ cont { color: 5592405 offset_y: 8 } - priority: 15531 + priority: 15584 } } element { scale: 13 symbol { name: "cave-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -37632,14 +37699,14 @@ cont { color: 5592405 offset_y: 8 } - priority: 15531 + priority: 15584 } } element { scale: 14 symbol { name: "cave-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -37647,14 +37714,14 @@ cont { color: 5592405 offset_y: 8 } - priority: 15531 + priority: 15584 } } element { scale: 15 symbol { name: "cave-m" - priority: 16531 + priority: 16584 } caption { primary { @@ -37662,14 +37729,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 16 symbol { name: "cave-m" - priority: 16531 + priority: 16584 } caption { primary { @@ -37677,14 +37744,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 17 symbol { name: "cave-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -37692,14 +37759,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "cave-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -37707,14 +37774,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "cave-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -37722,7 +37789,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -38018,56 +38085,56 @@ cont { scale: 12 area { color: 988160 - priority: -15874 + priority: -15862 } } element { scale: 13 area { color: 988160 - priority: -15874 + priority: -15862 } } element { scale: 14 area { color: 1251584 - priority: -15874 + priority: -15862 } } element { scale: 15 area { color: 1251584 - priority: -15874 + priority: -15862 } } element { scale: 16 area { color: 1251584 - priority: -15874 + priority: -15862 } } element { scale: 17 area { color: 1251584 - priority: -15874 + priority: -15862 } } element { scale: 18 area { color: 1251584 - priority: -15874 + priority: -15862 } } element { scale: 19 area { color: 1251584 - priority: -15874 + priority: -15862 } } } @@ -38077,56 +38144,56 @@ cont { scale: 12 area { color: 988160 - priority: -15874 + priority: -15862 } } element { scale: 13 area { color: 988160 - priority: -15874 + priority: -15862 } } element { scale: 14 area { color: 1251584 - priority: -15874 + priority: -15862 } } element { scale: 15 area { color: 1251584 - priority: -15874 + priority: -15862 } } element { scale: 16 area { color: 1251584 - priority: -15874 + priority: -15862 } } element { scale: 17 area { color: 1251584 - priority: -15874 + priority: -15862 } } element { scale: 18 area { color: 1251584 - priority: -15874 + priority: -15862 } } element { scale: 19 area { color: 1251584 - priority: -15874 + priority: -15862 } } } @@ -38136,84 +38203,84 @@ cont { scale: 0 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 1 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 2 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 3 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 4 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 5 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 6 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 7 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 8 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 9 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 10 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38221,7 +38288,7 @@ cont { scale: 10 area { color: 8738 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38229,14 +38296,14 @@ cont { scale: 11 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38244,7 +38311,7 @@ cont { scale: 11 area { color: 8738 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38252,14 +38319,14 @@ cont { scale: 12 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38267,7 +38334,7 @@ cont { scale: 12 area { color: 8738 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38275,14 +38342,14 @@ cont { scale: 13 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38290,7 +38357,7 @@ cont { scale: 13 area { color: 8738 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38298,14 +38365,14 @@ cont { scale: 14 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38313,7 +38380,7 @@ cont { scale: 14 area { color: 8738 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38321,14 +38388,14 @@ cont { scale: 15 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38336,7 +38403,7 @@ cont { scale: 15 area { color: 8738 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38344,14 +38411,14 @@ cont { scale: 16 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38359,7 +38426,7 @@ cont { scale: 16 area { color: 8738 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38367,14 +38434,14 @@ cont { scale: 17 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38382,7 +38449,7 @@ cont { scale: 17 area { color: 8738 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38390,14 +38457,14 @@ cont { scale: 18 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38405,7 +38472,7 @@ cont { scale: 18 area { color: 8738 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38413,14 +38480,14 @@ cont { scale: 19 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -38428,7 +38495,7 @@ cont { scale: 19 area { color: 8738 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -38582,7 +38649,7 @@ cont { scale: 12 symbol { name: "peakt-s" - priority: 16531 + priority: 16584 min_distance: 10 } caption { @@ -38591,7 +38658,7 @@ cont { color: 5592405 offset_y: 5 } - priority: 15531 + priority: 15584 } apply_if: "name" } @@ -38603,7 +38670,7 @@ cont { color: 5592405 offset_y: 5 } - priority: 15531 + priority: 15584 } apply_if: "!name" } @@ -38611,7 +38678,7 @@ cont { scale: 13 symbol { name: "peakt-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -38619,7 +38686,7 @@ cont { color: 5592405 offset_y: 5 } - priority: 15531 + priority: 15584 } apply_if: "name" } @@ -38631,7 +38698,7 @@ cont { color: 5592405 offset_y: 5 } - priority: 15531 + priority: 15584 } apply_if: "!name" } @@ -38639,7 +38706,7 @@ cont { scale: 14 symbol { name: "peakt-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -38647,7 +38714,7 @@ cont { color: 5592405 offset_y: 5 } - priority: 15531 + priority: 15584 } apply_if: "name" } @@ -38655,7 +38722,7 @@ cont { scale: 15 symbol { name: "peakt-m" - priority: 16531 + priority: 16584 } caption { primary { @@ -38663,14 +38730,14 @@ cont { color: 5592405 offset_y: 5 } - priority: 15531 + priority: 15584 } } element { scale: 16 symbol { name: "peakt-m" - priority: 16531 + priority: 16584 } caption { primary { @@ -38678,14 +38745,14 @@ cont { color: 5592405 offset_y: 5 } - priority: 15531 + priority: 15584 } } element { scale: 17 symbol { name: "peakt-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -38693,14 +38760,14 @@ cont { color: 5592405 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "peakt-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -38708,14 +38775,14 @@ cont { color: 5592405 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "peakt-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -38723,7 +38790,7 @@ cont { color: 5592405 offset_y: 6 } - priority: 15531 + priority: 15584 } } } @@ -38733,140 +38800,140 @@ cont { scale: 0 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 1 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 2 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 3 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 4 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 5 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 6 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 7 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 8 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 9 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 10 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 11 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 12 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 13 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 14 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 15 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 16 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 17 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 18 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 19 area { color: 8738 - priority: -15856 + priority: -15842 } } } @@ -38914,140 +38981,140 @@ cont { scale: 0 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 1 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 2 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 3 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 4 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 5 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 6 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 7 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 8 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 9 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 10 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 11 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 12 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 13 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 14 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 15 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 16 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 17 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 18 area { color: 8738 - priority: -15856 + priority: -15842 } } element { scale: 19 area { color: 8738 - priority: -15856 + priority: -15842 } } } @@ -39057,56 +39124,56 @@ cont { scale: 12 area { color: 988160 - priority: -15910 + priority: -15901 } } element { scale: 13 area { color: 988160 - priority: -15910 + priority: -15901 } } element { scale: 14 area { color: 1251584 - priority: -15910 + priority: -15901 } } element { scale: 15 area { color: 1251584 - priority: -15910 + priority: -15901 } } element { scale: 16 area { color: 1251584 - priority: -15910 + priority: -15901 } } element { scale: 17 area { color: 1251584 - priority: -15910 + priority: -15901 } } element { scale: 18 area { color: 1251584 - priority: -15910 + priority: -15901 } } element { scale: 19 area { color: 1251584 - priority: -15910 + priority: -15901 } } } @@ -39116,7 +39183,7 @@ cont { scale: 14 symbol { name: "drinking-water-s" - priority: 16522 + priority: 16574 min_distance: 24 } caption { @@ -39125,14 +39192,14 @@ cont { color: 5592405 offset_y: 6 } - priority: 15522 + priority: 15574 } } element { scale: 15 symbol { name: "drinking-water-m" - priority: 16522 + priority: 16574 min_distance: 24 } caption { @@ -39141,14 +39208,14 @@ cont { color: 5592405 offset_y: 8 } - priority: 15522 + priority: 15574 } } element { scale: 16 symbol { name: "drinking-water-m" - priority: 16522 + priority: 16574 min_distance: 24 } caption { @@ -39157,14 +39224,14 @@ cont { color: 5592405 offset_y: 8 } - priority: 15522 + priority: 15574 } } element { scale: 17 symbol { name: "drinking-water-l" - priority: 16522 + priority: 16574 min_distance: 24 } caption { @@ -39173,14 +39240,14 @@ cont { color: 5592405 offset_y: 8 } - priority: 15522 + priority: 15574 } } element { scale: 18 symbol { name: "drinking-water-l" - priority: 16522 + priority: 16574 min_distance: 24 } caption { @@ -39189,14 +39256,14 @@ cont { color: 5592405 offset_y: 8 } - priority: 15522 + priority: 15574 } } element { scale: 19 symbol { name: "drinking-water-l" - priority: 16522 + priority: 16574 min_distance: 24 } caption { @@ -39205,7 +39272,7 @@ cont { color: 5592405 offset_y: 8 } - priority: 15522 + priority: 15574 } } } @@ -39215,7 +39282,7 @@ cont { scale: 10 symbol { name: "volcano-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -39223,14 +39290,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 11 symbol { name: "volcano-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -39238,14 +39305,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 12 symbol { name: "volcano-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -39253,14 +39320,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 13 symbol { name: "volcano-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -39268,14 +39335,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 14 symbol { name: "volcano-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -39283,14 +39350,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 15 symbol { name: "volcano-m" - priority: 16531 + priority: 16584 } caption { primary { @@ -39298,14 +39365,14 @@ cont { color: 5592405 offset_y: 8 } - priority: 15531 + priority: 15584 } } element { scale: 16 symbol { name: "volcano-m" - priority: 16531 + priority: 16584 } caption { primary { @@ -39313,14 +39380,14 @@ cont { color: 5592405 offset_y: 8 } - priority: 15531 + priority: 15584 } } element { scale: 17 symbol { name: "volcano-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -39328,14 +39395,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "volcano-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -39343,14 +39410,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "volcano-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -39358,7 +39425,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -39368,84 +39435,84 @@ cont { scale: 0 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 1 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 2 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 3 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 4 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 5 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 6 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 7 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 8 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 9 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 10 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39453,7 +39520,7 @@ cont { scale: 10 area { color: 8738 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -39461,14 +39528,14 @@ cont { scale: 11 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39476,7 +39543,7 @@ cont { scale: 11 area { color: 8738 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -39484,14 +39551,14 @@ cont { scale: 12 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39499,7 +39566,7 @@ cont { scale: 12 area { color: 8738 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -39507,14 +39574,14 @@ cont { scale: 13 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 9 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39522,7 +39589,7 @@ cont { scale: 13 area { color: 8738 - priority: -15028 + priority: -15030 } apply_if: "bbox_area<4000000" } @@ -39530,14 +39597,14 @@ cont { scale: 14 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 10 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39545,14 +39612,14 @@ cont { scale: 14 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 10 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area<4000000" } @@ -39560,14 +39627,14 @@ cont { scale: 15 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 10 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39575,14 +39642,14 @@ cont { scale: 15 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 10 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area<4000000" } @@ -39590,14 +39657,14 @@ cont { scale: 16 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 11 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39605,14 +39672,14 @@ cont { scale: 16 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 11 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area<4000000" } @@ -39620,14 +39687,14 @@ cont { scale: 17 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 11 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39635,14 +39702,14 @@ cont { scale: 17 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 11 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area<4000000" } @@ -39650,14 +39717,14 @@ cont { scale: 18 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 11 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39665,14 +39732,14 @@ cont { scale: 18 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 11 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area<4000000" } @@ -39680,14 +39747,14 @@ cont { scale: 19 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 11 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area>=4000000" } @@ -39695,14 +39762,14 @@ cont { scale: 19 area { color: 8738 - priority: -15028 + priority: -15030 } caption { primary { height: 11 color: 19033 } - priority: 15972 + priority: 15970 } apply_if: "bbox_area<4000000" } @@ -39713,91 +39780,91 @@ cont { scale: 11 area { color: 6425 - priority: -15901 + priority: -15892 } } element { scale: 12 area { color: 6425 - priority: -15901 + priority: -15892 } } element { scale: 13 area { color: 6425 - priority: -15901 + priority: -15892 } } element { scale: 14 area { color: 6425 - priority: -15901 + priority: -15892 } } element { scale: 15 area { color: 6425 - priority: -15901 + priority: -15892 } } element { scale: 16 area { color: 6425 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 19033 } - priority: 15099 + priority: 15108 } } element { scale: 17 area { color: 6425 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 19033 } - priority: 15099 + priority: 15108 } } element { scale: 18 area { color: 6425 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 19033 } - priority: 15099 + priority: 15108 } } element { scale: 19 area { color: 6425 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 19033 } - priority: 15099 + priority: 15108 } } } @@ -39807,91 +39874,91 @@ cont { scale: 11 area { color: 6425 - priority: -15901 + priority: -15892 } } element { scale: 12 area { color: 6425 - priority: -15901 + priority: -15892 } } element { scale: 13 area { color: 6425 - priority: -15901 + priority: -15892 } } element { scale: 14 area { color: 6425 - priority: -15901 + priority: -15892 } } element { scale: 15 area { color: 6425 - priority: -15901 + priority: -15892 } } element { scale: 16 area { color: 6425 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 19033 } - priority: 15099 + priority: 15108 } } element { scale: 17 area { color: 6425 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 19033 } - priority: 15099 + priority: 15108 } } element { scale: 18 area { color: 6425 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 19033 } - priority: 15099 + priority: 15108 } } element { scale: 19 area { color: 6425 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 19033 } - priority: 15099 + priority: 15108 } } } @@ -39901,91 +39968,91 @@ cont { scale: 11 area { color: 6425 - priority: -15901 + priority: -15892 } } element { scale: 12 area { color: 6425 - priority: -15901 + priority: -15892 } } element { scale: 13 area { color: 6425 - priority: -15901 + priority: -15892 } } element { scale: 14 area { color: 6425 - priority: -15901 + priority: -15892 } } element { scale: 15 area { color: 6425 - priority: -15901 + priority: -15892 } } element { scale: 16 area { color: 6425 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 19033 } - priority: 15099 + priority: 15108 } } element { scale: 17 area { color: 6425 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 19033 } - priority: 15099 + priority: 15108 } } element { scale: 18 area { color: 6425 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 19033 } - priority: 15099 + priority: 15108 } } element { scale: 19 area { color: 6425 - priority: -15901 + priority: -15892 } caption { primary { height: 11 color: 19033 } - priority: 15099 + priority: 15108 } } } @@ -39995,70 +40062,70 @@ cont { scale: 10 area { color: 1251584 - priority: -15928 + priority: -15921 } } element { scale: 11 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 12 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 13 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 14 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 15 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 16 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 17 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 18 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 19 area { color: 1317888 - priority: -15928 + priority: -15921 } } } @@ -40068,70 +40135,70 @@ cont { scale: 10 area { color: 1251584 - priority: -15928 + priority: -15921 } } element { scale: 11 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 12 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 13 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 14 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 15 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 16 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 17 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 18 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 19 area { color: 1317888 - priority: -15928 + priority: -15921 } } } @@ -40141,70 +40208,70 @@ cont { scale: 10 area { color: 1251584 - priority: -15928 + priority: -15921 } } element { scale: 11 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 12 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 13 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 14 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 15 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 16 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 17 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 18 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 19 area { color: 1317888 - priority: -15928 + priority: -15921 } } } @@ -40214,70 +40281,70 @@ cont { scale: 10 area { color: 1251584 - priority: -15928 + priority: -15921 } } element { scale: 11 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 12 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 13 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 14 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 15 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 16 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 17 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 18 area { color: 1317888 - priority: -15928 + priority: -15921 } } element { scale: 19 area { color: 1317888 - priority: -15928 + priority: -15921 } } } @@ -40287,7 +40354,7 @@ cont { scale: 18 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40295,14 +40362,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40310,7 +40377,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -40320,7 +40387,7 @@ cont { scale: 18 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40328,14 +40395,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40343,7 +40410,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -40353,7 +40420,7 @@ cont { scale: 18 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40361,14 +40428,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40376,7 +40443,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -40386,7 +40453,7 @@ cont { scale: 18 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40394,14 +40461,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40409,7 +40476,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -40419,7 +40486,7 @@ cont { scale: 17 symbol { name: "lawyer-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -40428,14 +40495,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "lawyer-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -40444,14 +40511,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "lawyer-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -40460,7 +40527,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -40470,7 +40537,7 @@ cont { scale: 18 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40478,14 +40545,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "office-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -40493,7 +40560,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } } @@ -40504,7 +40571,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1963 + priority: 1960 join: BEVELJOIN cap: BUTTCAP } @@ -40514,7 +40581,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40524,7 +40591,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40534,7 +40601,7 @@ cont { lines { width: 1.6 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40544,7 +40611,7 @@ cont { lines { width: 1.6 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40554,7 +40621,7 @@ cont { lines { width: 2.0 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40564,7 +40631,7 @@ cont { lines { width: 2.0 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40574,7 +40641,7 @@ cont { lines { width: 2.0 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40587,7 +40654,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1963 + priority: 1960 join: BEVELJOIN cap: BUTTCAP } @@ -40597,7 +40664,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40607,7 +40674,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40617,7 +40684,7 @@ cont { lines { width: 1.6 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40627,7 +40694,7 @@ cont { lines { width: 1.6 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40637,7 +40704,7 @@ cont { lines { width: 2.0 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40647,7 +40714,7 @@ cont { lines { width: 2.0 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40657,7 +40724,7 @@ cont { lines { width: 2.0 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40670,7 +40737,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1963 + priority: 1960 join: BEVELJOIN cap: BUTTCAP } @@ -40680,7 +40747,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40690,7 +40757,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40700,7 +40767,7 @@ cont { lines { width: 1.6 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40710,7 +40777,7 @@ cont { lines { width: 1.6 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40720,7 +40787,7 @@ cont { lines { width: 2.0 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40730,7 +40797,7 @@ cont { lines { width: 2.0 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40740,7 +40807,7 @@ cont { lines { width: 2.0 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40753,7 +40820,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1963 + priority: 1960 join: BEVELJOIN cap: BUTTCAP } @@ -40763,7 +40830,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40773,7 +40840,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40783,7 +40850,7 @@ cont { lines { width: 1.6 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40793,7 +40860,7 @@ cont { lines { width: 1.6 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40803,7 +40870,7 @@ cont { lines { width: 2.0 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40813,7 +40880,7 @@ cont { lines { width: 2.0 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40823,7 +40890,7 @@ cont { lines { width: 2.0 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40836,7 +40903,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1963 + priority: 1960 join: BEVELJOIN cap: BUTTCAP } @@ -40846,7 +40913,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40856,7 +40923,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40866,7 +40933,7 @@ cont { lines { width: 1.6 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: BUTTCAP } @@ -40876,7 +40943,7 @@ cont { lines { width: 1.6 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40886,7 +40953,7 @@ cont { lines { width: 2.0 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40896,7 +40963,7 @@ cont { lines { width: 2.0 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40906,7 +40973,7 @@ cont { lines { width: 2.0 color: 5131837 - priority: 1963 + priority: 1960 join: ROUNDJOIN cap: ROUNDCAP } @@ -40919,7 +40986,7 @@ cont { lines { width: 0.8 color: 6438271 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -40929,7 +40996,7 @@ cont { lines { width: 1.1 color: 6438271 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -40939,7 +41006,7 @@ cont { lines { width: 1.1 color: 6438271 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -40949,7 +41016,7 @@ cont { lines { width: 1.5 color: 6438271 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -40959,7 +41026,7 @@ cont { lines { width: 1.5 color: 6438271 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -40969,7 +41036,7 @@ cont { lines { width: 1.5 color: 6438271 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -40982,7 +41049,7 @@ cont { lines { width: 1.0 color: 2236962 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -40992,7 +41059,7 @@ cont { lines { width: 1.1 color: 2236962 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41002,7 +41069,7 @@ cont { lines { width: 1.1 color: 2236962 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41012,7 +41079,7 @@ cont { lines { width: 1.5 color: 2236962 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41022,7 +41089,7 @@ cont { lines { width: 1.5 color: 2236962 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41032,7 +41099,7 @@ cont { lines { width: 1.5 color: 2236962 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41045,7 +41112,7 @@ cont { lines { width: 1.0 color: 731131 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41055,7 +41122,7 @@ cont { lines { width: 1.1 color: 731131 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41065,7 +41132,7 @@ cont { lines { width: 1.1 color: 731131 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41075,7 +41142,7 @@ cont { lines { width: 1.5 color: 731131 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41085,7 +41152,7 @@ cont { lines { width: 1.5 color: 731131 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41095,7 +41162,7 @@ cont { lines { width: 1.5 color: 731131 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41108,7 +41175,7 @@ cont { lines { width: 1.0 color: 3355443 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41118,7 +41185,7 @@ cont { lines { width: 1.1 color: 3355443 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41128,7 +41195,7 @@ cont { lines { width: 1.1 color: 3355443 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41138,7 +41205,7 @@ cont { lines { width: 1.5 color: 3355443 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41148,7 +41215,7 @@ cont { lines { width: 1.5 color: 3355443 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41158,7 +41225,7 @@ cont { lines { width: 1.5 color: 3355443 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41171,7 +41238,7 @@ cont { lines { width: 1.0 color: 3355443 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41181,7 +41248,7 @@ cont { lines { width: 1.1 color: 3355443 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41191,7 +41258,7 @@ cont { lines { width: 1.1 color: 3355443 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41201,7 +41268,7 @@ cont { lines { width: 1.5 color: 3355443 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41211,7 +41278,7 @@ cont { lines { width: 1.5 color: 3355443 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41221,7 +41288,7 @@ cont { lines { width: 1.5 color: 3355443 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41234,7 +41301,7 @@ cont { lines { width: 1.0 color: 16518683 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41244,7 +41311,7 @@ cont { lines { width: 1.1 color: 16518683 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41254,7 +41321,7 @@ cont { lines { width: 1.1 color: 16518683 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41264,7 +41331,7 @@ cont { lines { width: 1.5 color: 16518683 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41274,7 +41341,7 @@ cont { lines { width: 1.5 color: 16518683 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41284,7 +41351,7 @@ cont { lines { width: 1.5 color: 16518683 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41297,7 +41364,7 @@ cont { lines { width: 1.0 color: 6286126 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41307,7 +41374,7 @@ cont { lines { width: 1.1 color: 6286126 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41317,7 +41384,7 @@ cont { lines { width: 1.1 color: 6286126 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41327,7 +41394,7 @@ cont { lines { width: 1.5 color: 6286126 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41337,7 +41404,7 @@ cont { lines { width: 1.5 color: 6286126 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41347,7 +41414,7 @@ cont { lines { width: 1.5 color: 6286126 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41360,7 +41427,7 @@ cont { lines { width: 0.8 color: 6438271 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41370,7 +41437,7 @@ cont { lines { width: 1.1 color: 6438271 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41380,7 +41447,7 @@ cont { lines { width: 1.1 color: 6438271 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41390,7 +41457,7 @@ cont { lines { width: 1.5 color: 6438271 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41400,7 +41467,7 @@ cont { lines { width: 1.5 color: 6438271 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41410,7 +41477,7 @@ cont { lines { width: 1.5 color: 6438271 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41423,7 +41490,7 @@ cont { lines { width: 0.8 color: 6438271 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41433,7 +41500,7 @@ cont { lines { width: 1.1 color: 6438271 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: BUTTCAP } @@ -41443,7 +41510,7 @@ cont { lines { width: 1.1 color: 6438271 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41453,7 +41520,7 @@ cont { lines { width: 1.5 color: 6438271 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41463,7 +41530,7 @@ cont { lines { width: 1.5 color: 6438271 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41473,7 +41540,7 @@ cont { lines { width: 1.5 color: 6438271 - priority: 1216 + priority: 1237 join: ROUNDJOIN cap: ROUNDCAP } @@ -41496,7 +41563,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=1000000" } @@ -41515,7 +41582,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=150000" } @@ -41534,7 +41601,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=50000" } @@ -41553,7 +41620,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41572,7 +41639,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41591,7 +41658,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41610,7 +41677,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41629,7 +41696,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41648,7 +41715,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41667,7 +41734,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41686,7 +41753,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41705,7 +41772,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41724,7 +41791,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41743,7 +41810,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41762,7 +41829,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41781,7 +41848,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41803,7 +41870,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=1000000" } @@ -41822,7 +41889,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=150000" } @@ -41841,7 +41908,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=50000" } @@ -41860,7 +41927,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41879,7 +41946,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41898,7 +41965,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41917,7 +41984,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41936,7 +42003,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41955,7 +42022,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41974,7 +42041,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -41993,7 +42060,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42012,7 +42079,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42031,7 +42098,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42050,7 +42117,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42069,7 +42136,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42088,7 +42155,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42110,7 +42177,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=1000000" } @@ -42129,7 +42196,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=150000" } @@ -42148,7 +42215,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=50000" } @@ -42167,7 +42234,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42186,7 +42253,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42205,7 +42272,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42224,7 +42291,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42243,7 +42310,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42262,7 +42329,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42281,7 +42348,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42300,7 +42367,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42319,7 +42386,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42338,7 +42405,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42357,7 +42424,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42376,7 +42443,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42395,7 +42462,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42417,7 +42484,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=1000000" } @@ -42436,7 +42503,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=150000" } @@ -42455,7 +42522,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=50000" } @@ -42474,7 +42541,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42493,7 +42560,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42512,7 +42579,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42531,7 +42598,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42550,7 +42617,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42569,7 +42636,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42588,7 +42655,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42607,7 +42674,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42626,7 +42693,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42645,7 +42712,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42664,7 +42731,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42683,7 +42750,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42702,7 +42769,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -42714,7 +42781,7 @@ cont { symbol { name: "star-s" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -42730,7 +42797,7 @@ cont { offset_y: 9 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -42738,7 +42805,7 @@ cont { symbol { name: "star-m" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -42754,7 +42821,7 @@ cont { offset_y: 9 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -42762,7 +42829,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -42778,7 +42845,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -42786,7 +42853,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -42802,7 +42869,7 @@ cont { offset_y: 11 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -42810,7 +42877,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -42826,7 +42893,7 @@ cont { offset_y: 11 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -42834,7 +42901,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -42850,7 +42917,7 @@ cont { offset_y: 11 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -42858,7 +42925,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -42874,7 +42941,7 @@ cont { offset_y: 9 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -42882,7 +42949,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -42898,7 +42965,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -42906,7 +42973,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -42922,7 +42989,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -42930,7 +42997,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -42946,7 +43013,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -42954,7 +43021,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -42970,7 +43037,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -42978,7 +43045,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -42994,7 +43061,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -43002,7 +43069,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -43018,7 +43085,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -43026,7 +43093,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -43042,7 +43109,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -43050,7 +43117,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -43066,7 +43133,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } element { @@ -43074,7 +43141,7 @@ cont { symbol { name: "star-l" apply_for_type: 1 - priority: 16504 + priority: 16554 } caption { primary { @@ -43090,7 +43157,7 @@ cont { offset_y: 10 text: "int_name" } - priority: 15504 + priority: 15554 } } } @@ -43111,7 +43178,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15486 + priority: 15534 } apply_if: "population>=1000000" } @@ -43130,7 +43197,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15486 + priority: 15534 } apply_if: "population>=150000" } @@ -43149,7 +43216,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15486 + priority: 15534 } apply_if: "population>=50000" } @@ -43168,7 +43235,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43187,7 +43254,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43206,7 +43273,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43225,7 +43292,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43244,7 +43311,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43263,7 +43330,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43282,7 +43349,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43301,7 +43368,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43320,7 +43387,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43339,7 +43406,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43358,7 +43425,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43377,7 +43444,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43396,7 +43463,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43418,7 +43485,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15486 + priority: 15534 } apply_if: "population>=1000000" } @@ -43437,7 +43504,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15486 + priority: 15534 } apply_if: "population>=150000" } @@ -43456,7 +43523,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15486 + priority: 15534 } apply_if: "population>=50000" } @@ -43475,7 +43542,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43494,7 +43561,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43513,7 +43580,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43532,7 +43599,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43551,7 +43618,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43570,7 +43637,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43589,7 +43656,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43608,7 +43675,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43627,7 +43694,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43646,7 +43713,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43665,7 +43732,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43684,7 +43751,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43703,7 +43770,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43725,7 +43792,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=1000000" } @@ -43744,7 +43811,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=150000" } @@ -43763,7 +43830,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=50000" } @@ -43782,7 +43849,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43801,7 +43868,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43820,7 +43887,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43839,7 +43906,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43858,7 +43925,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43877,7 +43944,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43896,7 +43963,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43915,7 +43982,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43934,7 +44001,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43953,7 +44020,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43972,7 +44039,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -43991,7 +44058,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44010,7 +44077,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44032,7 +44099,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=1000000" } @@ -44051,7 +44118,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=150000" } @@ -44070,7 +44137,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=50000" } @@ -44089,7 +44156,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44108,7 +44175,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44127,7 +44194,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44146,7 +44213,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44165,7 +44232,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44184,7 +44251,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44203,7 +44270,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44222,7 +44289,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44241,7 +44308,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44260,7 +44327,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44279,7 +44346,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44298,7 +44365,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44317,7 +44384,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44339,7 +44406,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=1000000" } @@ -44358,7 +44425,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=150000" } @@ -44377,7 +44444,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=50000" } @@ -44396,7 +44463,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44415,7 +44482,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44434,7 +44501,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44453,7 +44520,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44472,7 +44539,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44491,7 +44558,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44510,7 +44577,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44529,7 +44596,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44548,7 +44615,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44567,7 +44634,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44586,7 +44653,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44605,7 +44672,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44624,7 +44691,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44646,7 +44713,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=1000000" } @@ -44665,7 +44732,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=150000" } @@ -44684,7 +44751,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=50000" } @@ -44703,7 +44770,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44722,7 +44789,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44741,7 +44808,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44760,7 +44827,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44779,7 +44846,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44798,7 +44865,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44817,7 +44884,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44836,7 +44903,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44855,7 +44922,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44874,7 +44941,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44893,7 +44960,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44912,7 +44979,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44931,7 +44998,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -44953,7 +45020,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=1000000" } @@ -44972,7 +45039,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=150000" } @@ -44991,7 +45058,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15477 + priority: 15524 } apply_if: "population>=50000" } @@ -45010,7 +45077,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45029,7 +45096,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45048,7 +45115,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45067,7 +45134,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45086,7 +45153,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45105,7 +45172,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45124,7 +45191,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45143,7 +45210,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45162,7 +45229,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45181,7 +45248,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45200,7 +45267,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45219,7 +45286,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45238,7 +45305,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15495 + priority: 15544 } apply_if: "population>=40000" } @@ -45650,7 +45717,7 @@ cont { color: 6710886 stroke_color: 1712394496 } - priority: 15441 + priority: 15485 } } element { @@ -45661,7 +45728,7 @@ cont { color: 6710886 stroke_color: 1712394496 } - priority: 15441 + priority: 15485 } } element { @@ -45672,7 +45739,7 @@ cont { color: 6710886 stroke_color: 1712394496 } - priority: 15441 + priority: 15485 } } element { @@ -45683,7 +45750,7 @@ cont { color: 6710886 stroke_color: 1712394496 } - priority: 15441 + priority: 15485 } } element { @@ -45694,7 +45761,7 @@ cont { color: 6710886 stroke_color: 1712394496 } - priority: 15441 + priority: 15485 } } element { @@ -45705,7 +45772,7 @@ cont { color: 6710886 stroke_color: 1712394496 } - priority: 15441 + priority: 15485 } } element { @@ -45716,7 +45783,7 @@ cont { color: 6710886 stroke_color: 1712394496 } - priority: 15441 + priority: 15485 } } } @@ -46234,7 +46301,7 @@ cont { height: 14 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46244,7 +46311,7 @@ cont { height: 14 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46254,7 +46321,7 @@ cont { height: 15 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46264,7 +46331,7 @@ cont { height: 16 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46274,7 +46341,7 @@ cont { height: 18 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46284,7 +46351,7 @@ cont { height: 18 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46294,7 +46361,7 @@ cont { height: 18 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46304,7 +46371,7 @@ cont { height: 18 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46314,7 +46381,7 @@ cont { height: 18 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46324,7 +46391,7 @@ cont { height: 18 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46334,7 +46401,7 @@ cont { height: 18 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46344,7 +46411,7 @@ cont { height: 18 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46354,7 +46421,7 @@ cont { height: 18 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46364,7 +46431,7 @@ cont { height: 18 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46374,7 +46441,7 @@ cont { height: 18 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46384,7 +46451,7 @@ cont { height: 18 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46394,7 +46461,7 @@ cont { height: 18 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46404,7 +46471,7 @@ cont { height: 18 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46414,7 +46481,7 @@ cont { height: 18 color: 19033 } - priority: 15945 + priority: 15940 } } } @@ -46450,7 +46517,7 @@ cont { height: 12 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46460,7 +46527,7 @@ cont { height: 12 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46470,7 +46537,7 @@ cont { height: 12 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46480,7 +46547,7 @@ cont { height: 12 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46490,7 +46557,7 @@ cont { height: 12 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46500,7 +46567,7 @@ cont { height: 12 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46510,7 +46577,7 @@ cont { height: 12 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46520,7 +46587,7 @@ cont { height: 12 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46530,7 +46597,7 @@ cont { height: 12 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46540,7 +46607,7 @@ cont { height: 12 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46550,7 +46617,7 @@ cont { height: 12 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46560,7 +46627,7 @@ cont { height: 12 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46570,7 +46637,7 @@ cont { height: 12 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46580,7 +46647,7 @@ cont { height: 12 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46590,7 +46657,7 @@ cont { height: 12 color: 19033 } - priority: 15945 + priority: 15940 } } element { @@ -46600,7 +46667,7 @@ cont { height: 12 color: 19033 } - priority: 15945 + priority: 15940 } } } @@ -46613,7 +46680,7 @@ cont { height: 11 color: 4473924 } - priority: 15432 + priority: 15475 } } element { @@ -46629,7 +46696,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15432 + priority: 15475 } } element { @@ -46645,7 +46712,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15432 + priority: 15475 } } element { @@ -46661,7 +46728,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15432 + priority: 15475 } } element { @@ -46677,7 +46744,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15432 + priority: 15475 } } } @@ -46690,7 +46757,7 @@ cont { height: 11 color: 4473924 } - priority: 15432 + priority: 15475 } } element { @@ -46700,7 +46767,7 @@ cont { height: 11 color: 4473924 } - priority: 15432 + priority: 15475 } } element { @@ -46716,7 +46783,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15432 + priority: 15475 } } element { @@ -46732,7 +46799,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15432 + priority: 15475 } } element { @@ -46748,7 +46815,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15432 + priority: 15475 } } element { @@ -46764,7 +46831,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15432 + priority: 15475 } } } @@ -46848,7 +46915,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } apply_if: "population>=40000" } @@ -46865,7 +46932,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } apply_if: "population>=20000" } @@ -46884,7 +46951,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } element { @@ -46902,7 +46969,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } element { @@ -46920,7 +46987,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } element { @@ -46938,7 +47005,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } element { @@ -46956,7 +47023,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } element { @@ -46974,7 +47041,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } element { @@ -46992,7 +47059,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } element { @@ -47010,7 +47077,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } element { @@ -47028,7 +47095,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } element { @@ -47046,7 +47113,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15468 + priority: 15514 } } } @@ -47067,7 +47134,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15459 + priority: 15504 } } element { @@ -47085,7 +47152,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15459 + priority: 15504 } } element { @@ -47103,7 +47170,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15459 + priority: 15504 } } element { @@ -47121,7 +47188,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15459 + priority: 15504 } } element { @@ -47139,7 +47206,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15459 + priority: 15504 } } element { @@ -47157,7 +47224,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15459 + priority: 15504 } } element { @@ -47175,7 +47242,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15459 + priority: 15504 } } element { @@ -47193,7 +47260,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15459 + priority: 15504 } } element { @@ -47211,7 +47278,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15459 + priority: 15504 } } } @@ -47222,7 +47289,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1513 + priority: 1564 join: ROUNDJOIN cap: ROUNDCAP } @@ -47235,7 +47302,7 @@ cont { lines { width: 1.0 color: 5131837 - priority: 1513 + priority: 1564 join: ROUNDJOIN cap: ROUNDCAP } @@ -47247,7 +47314,7 @@ cont { scale: 17 symbol { name: "power-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -47256,14 +47323,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "power-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -47272,14 +47339,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "power-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -47288,7 +47355,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -47298,7 +47365,7 @@ cont { scale: 17 symbol { name: "power-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -47307,14 +47374,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "power-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -47323,14 +47390,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "power-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -47339,7 +47406,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -47412,28 +47479,28 @@ cont { scale: 16 area { color: 2499106 - priority: -15883 + priority: -15872 } } element { scale: 17 area { color: 2499106 - priority: -15883 + priority: -15872 } } element { scale: 18 area { color: 2499106 - priority: -15883 + priority: -15872 } } element { scale: 19 area { color: 2499106 - priority: -15883 + priority: -15872 } } } @@ -47448,7 +47515,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47462,7 +47529,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47476,7 +47543,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47490,7 +47557,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47507,7 +47574,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47528,7 +47595,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47549,7 +47616,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47570,7 +47637,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47594,7 +47661,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47608,7 +47675,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47622,7 +47689,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47636,7 +47703,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47653,7 +47720,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47667,7 +47734,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47681,7 +47748,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47695,7 +47762,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47712,7 +47779,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47726,7 +47793,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47740,7 +47807,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -47754,7 +47821,7 @@ cont { dd: 1.8 dd: 5.4 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -48016,7 +48083,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 min_distance: 10 } } @@ -48025,7 +48092,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -48041,7 +48108,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -48049,7 +48116,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -48065,7 +48132,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -48073,7 +48140,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -48089,7 +48156,7 @@ cont { offset_y: 6 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -48097,7 +48164,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -48113,7 +48180,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -48121,7 +48188,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -48137,7 +48204,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -48145,7 +48212,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -48161,7 +48228,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -48169,7 +48236,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -48185,7 +48252,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -48193,7 +48260,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -48209,7 +48276,7 @@ cont { offset_y: 18 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -48220,7 +48287,7 @@ cont { symbol { name: "railway-crossing" apply_for_type: 1 - priority: 16594 + priority: 16653 } } element { @@ -48228,7 +48295,7 @@ cont { symbol { name: "railway-crossing" apply_for_type: 1 - priority: 16594 + priority: 16653 } } element { @@ -48236,7 +48303,7 @@ cont { symbol { name: "railway-crossing" apply_for_type: 1 - priority: 16594 + priority: 16653 } } } @@ -48247,7 +48314,7 @@ cont { lines { width: 0.8 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -48257,7 +48324,7 @@ cont { lines { width: 1.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -48267,7 +48334,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -48277,7 +48344,7 @@ cont { lines { width: 2.6 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -48288,7 +48355,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48298,7 +48365,7 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -48309,7 +48376,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48319,7 +48386,7 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -48330,7 +48397,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48340,7 +48407,7 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -48351,7 +48418,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48364,7 +48431,7 @@ cont { lines { width: 0.8 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -48374,14 +48441,14 @@ cont { lines { width: 1.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.0 color: 2236945 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -48391,14 +48458,14 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 2236945 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -48408,21 +48475,21 @@ cont { lines { width: 2.6 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 5.0 color: 2236945 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } lines { width: 5.4 color: 4473924 - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -48433,7 +48500,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48443,21 +48510,21 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 6.8 color: 2236945 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.2 color: 4473924 - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -48468,7 +48535,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48478,21 +48545,21 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 2236945 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 4473924 - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -48503,7 +48570,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48513,21 +48580,21 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 2236945 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 4473924 - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -48538,7 +48605,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48551,7 +48618,7 @@ cont { lines { width: 0.8 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -48565,14 +48632,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -48586,14 +48653,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.2 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -48607,14 +48674,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 2.6 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -48625,7 +48692,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48639,14 +48706,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -48657,7 +48724,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48671,14 +48738,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -48689,7 +48756,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48703,14 +48770,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -48721,7 +48788,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -48734,7 +48801,7 @@ cont { lines { width: 1.0 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -48744,7 +48811,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -48754,7 +48821,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48764,7 +48831,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48774,7 +48841,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48784,7 +48851,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48797,7 +48864,7 @@ cont { lines { width: 1.0 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -48807,7 +48874,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -48817,7 +48884,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48827,7 +48894,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48837,7 +48904,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48847,7 +48914,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48860,7 +48927,7 @@ cont { lines { width: 1.0 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -48870,7 +48937,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -48880,7 +48947,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48890,7 +48957,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48900,7 +48967,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48910,7 +48977,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48923,7 +48990,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -48933,7 +49000,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48943,7 +49010,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48953,7 +49020,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48963,7 +49030,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48976,7 +49043,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -48986,7 +49053,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -48996,7 +49063,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49006,7 +49073,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49016,7 +49083,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49029,7 +49096,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -49039,7 +49106,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49049,7 +49116,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49059,7 +49126,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49069,7 +49136,7 @@ cont { lines { width: 2.0 color: 3355443 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -49081,28 +49148,28 @@ cont { scale: 16 area { color: 2499106 - priority: -15883 + priority: -15872 } } element { scale: 17 area { color: 2499106 - priority: -15883 + priority: -15872 } } element { scale: 18 area { color: 2499106 - priority: -15883 + priority: -15872 } } element { scale: 19 area { color: 2499106 - priority: -15883 + priority: -15872 } } } @@ -49117,7 +49184,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49131,7 +49198,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49145,7 +49212,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49159,7 +49226,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49176,7 +49243,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49197,7 +49264,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49218,7 +49285,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49239,7 +49306,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49263,7 +49330,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49277,7 +49344,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49291,7 +49358,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49305,7 +49372,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1261 + priority: 1287 join: ROUNDJOIN cap: ROUNDCAP } @@ -49318,7 +49385,7 @@ cont { lines { width: 0.6 color: 3355443 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -49328,7 +49395,7 @@ cont { lines { width: 0.6 color: 3355443 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -49338,7 +49405,7 @@ cont { lines { width: 0.8 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -49348,7 +49415,7 @@ cont { lines { width: 1.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -49358,7 +49425,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -49368,7 +49435,7 @@ cont { lines { width: 2.6 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49379,7 +49446,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49389,7 +49456,7 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49400,7 +49467,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49410,7 +49477,7 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49421,7 +49488,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49431,7 +49498,7 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49442,7 +49509,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49455,7 +49522,7 @@ cont { lines { width: 0.6 color: 3355443 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -49465,7 +49532,7 @@ cont { lines { width: 0.6 color: 3355443 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -49475,7 +49542,7 @@ cont { lines { width: 0.8 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -49485,14 +49552,14 @@ cont { lines { width: 1.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } @@ -49502,14 +49569,14 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } @@ -49519,21 +49586,21 @@ cont { lines { width: 2.6 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 5.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 5.4 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -49544,7 +49611,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49554,21 +49621,21 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 6.8 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.2 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -49579,7 +49646,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49589,21 +49656,21 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -49614,7 +49681,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49624,21 +49691,21 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 2236945 - priority: 1251 + priority: 1276 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 4473924 - priority: 1242 + priority: 1266 join: ROUNDJOIN cap: BUTTCAP } @@ -49649,7 +49716,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49662,7 +49729,7 @@ cont { lines { width: 0.6 color: 3355443 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -49672,7 +49739,7 @@ cont { lines { width: 0.6 color: 3355443 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -49682,7 +49749,7 @@ cont { lines { width: 0.8 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -49692,7 +49759,7 @@ cont { lines { width: 1.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -49702,7 +49769,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -49712,7 +49779,7 @@ cont { lines { width: 2.6 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49723,7 +49790,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49733,7 +49800,7 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49744,7 +49811,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49754,7 +49821,7 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49765,7 +49832,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49775,7 +49842,7 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49786,7 +49853,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49799,7 +49866,7 @@ cont { lines { width: 0.6 color: 3355443 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -49809,7 +49876,7 @@ cont { lines { width: 0.6 color: 3355443 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -49819,7 +49886,7 @@ cont { lines { width: 0.8 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -49833,14 +49900,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -49854,14 +49921,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.2 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -49875,14 +49942,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 2.6 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49893,7 +49960,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49907,14 +49974,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49925,7 +49992,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49939,14 +50006,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49957,7 +50024,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -49971,14 +50038,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -49989,7 +50056,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -50002,7 +50069,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50010,7 +50077,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50018,7 +50085,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50026,7 +50093,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50034,7 +50101,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50042,7 +50109,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50050,7 +50117,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } } } @@ -50061,7 +50128,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50069,7 +50136,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50077,7 +50144,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50085,7 +50152,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50093,7 +50160,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50101,7 +50168,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50109,7 +50176,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } } } @@ -50120,7 +50187,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50128,7 +50195,7 @@ cont { symbol { name: "train-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50136,7 +50203,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50144,7 +50211,7 @@ cont { symbol { name: "train-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50152,7 +50219,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50160,7 +50227,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { @@ -50168,7 +50235,7 @@ cont { symbol { name: "train-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } } } @@ -50179,7 +50246,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -50188,7 +50255,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -50205,7 +50272,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50213,7 +50280,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50229,7 +50296,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50237,7 +50304,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50253,7 +50320,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50261,7 +50328,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50277,7 +50344,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50285,7 +50352,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50301,7 +50368,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50309,7 +50376,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50325,7 +50392,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -50336,7 +50403,7 @@ cont { symbol { name: "subway-barcelona-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -50345,7 +50412,7 @@ cont { symbol { name: "subway-barcelona-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -50362,7 +50429,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50370,7 +50437,7 @@ cont { symbol { name: "subway-barcelona-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50386,7 +50453,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50394,7 +50461,7 @@ cont { symbol { name: "subway-barcelona-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50410,7 +50477,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50418,7 +50485,7 @@ cont { symbol { name: "subway-barcelona-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50434,7 +50501,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50442,7 +50509,7 @@ cont { symbol { name: "subway-barcelona-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50458,7 +50525,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50466,7 +50533,7 @@ cont { symbol { name: "subway-barcelona-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50482,7 +50549,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -50493,7 +50560,7 @@ cont { symbol { name: "subway-berlin-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -50502,7 +50569,7 @@ cont { symbol { name: "subway-berlin-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -50519,7 +50586,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50527,7 +50594,7 @@ cont { symbol { name: "subway-berlin-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50543,7 +50610,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50551,7 +50618,7 @@ cont { symbol { name: "subway-berlin-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50567,7 +50634,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50575,7 +50642,7 @@ cont { symbol { name: "subway-berlin-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50591,7 +50658,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50599,7 +50666,7 @@ cont { symbol { name: "subway-berlin-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50615,7 +50682,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50623,7 +50690,7 @@ cont { symbol { name: "subway-berlin-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50639,7 +50706,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -50650,7 +50717,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -50659,7 +50726,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -50676,7 +50743,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50684,7 +50751,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50700,7 +50767,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50708,7 +50775,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50724,7 +50791,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50732,7 +50799,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50748,7 +50815,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50756,7 +50823,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50772,7 +50839,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50780,7 +50847,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50796,7 +50863,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -50807,7 +50874,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -50816,7 +50883,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -50833,7 +50900,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50841,7 +50908,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50857,7 +50924,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50865,7 +50932,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50881,7 +50948,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50889,7 +50956,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50905,7 +50972,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50913,7 +50980,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50929,7 +50996,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50937,7 +51004,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -50953,7 +51020,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -50964,7 +51031,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -50973,7 +51040,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -50990,7 +51057,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -50998,7 +51065,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51014,7 +51081,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51022,7 +51089,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51038,7 +51105,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51046,7 +51113,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51062,7 +51129,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51070,7 +51137,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51086,7 +51153,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51094,7 +51161,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51110,7 +51177,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -51121,7 +51188,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -51130,7 +51197,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -51147,7 +51214,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51155,7 +51222,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51171,7 +51238,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51179,7 +51246,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51195,7 +51262,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51203,7 +51270,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51219,7 +51286,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51227,7 +51294,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51243,7 +51310,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51251,7 +51318,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51267,7 +51334,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -51278,7 +51345,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -51287,7 +51354,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -51304,7 +51371,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51312,7 +51379,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51328,7 +51395,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51336,7 +51403,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51352,7 +51419,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51360,7 +51427,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51376,7 +51443,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51384,7 +51451,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51400,7 +51467,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51408,7 +51475,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51424,7 +51491,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -51435,7 +51502,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -51444,7 +51511,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -51461,7 +51528,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51469,7 +51536,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51485,7 +51552,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51493,7 +51560,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51509,7 +51576,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51517,7 +51584,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51533,7 +51600,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51541,7 +51608,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51557,7 +51624,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51565,7 +51632,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51581,7 +51648,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -51592,7 +51659,7 @@ cont { symbol { name: "subway-kiev-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -51602,7 +51669,7 @@ cont { stroke_color: 1292964096 offset_y: 8 } - priority: 15918 + priority: 15910 } } element { @@ -51610,7 +51677,7 @@ cont { symbol { name: "subway-kiev-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -51627,7 +51694,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51635,7 +51702,7 @@ cont { symbol { name: "subway-kiev-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51651,7 +51718,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51659,7 +51726,7 @@ cont { symbol { name: "subway-kiev-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51675,15 +51742,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 17 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51697,15 +51764,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 18 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51719,15 +51786,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 19 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51741,7 +51808,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -51752,7 +51819,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -51761,7 +51828,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -51778,7 +51845,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51786,7 +51853,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51802,7 +51869,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51810,7 +51877,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51826,7 +51893,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51834,7 +51901,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51850,7 +51917,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51858,7 +51925,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51874,7 +51941,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51882,7 +51949,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51898,7 +51965,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -51909,7 +51976,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -51918,7 +51985,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -51935,7 +52002,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51943,7 +52010,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51959,7 +52026,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51967,7 +52034,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -51983,7 +52050,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -51991,7 +52058,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52007,7 +52074,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52015,7 +52082,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52031,7 +52098,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52039,7 +52106,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52055,7 +52122,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -52066,7 +52133,7 @@ cont { symbol { name: "subway-london-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -52075,7 +52142,7 @@ cont { symbol { name: "subway-london-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -52092,7 +52159,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52100,7 +52167,7 @@ cont { symbol { name: "subway-london-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52116,7 +52183,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52124,7 +52191,7 @@ cont { symbol { name: "subway-london-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52140,7 +52207,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52148,7 +52215,7 @@ cont { symbol { name: "subway-london-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52164,7 +52231,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52172,7 +52239,7 @@ cont { symbol { name: "subway-london-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52188,7 +52255,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52196,7 +52263,7 @@ cont { symbol { name: "subway-london-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52212,7 +52279,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -52223,7 +52290,7 @@ cont { symbol { name: "subway-madrid-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -52232,7 +52299,7 @@ cont { symbol { name: "subway-madrid-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -52249,7 +52316,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52257,7 +52324,7 @@ cont { symbol { name: "subway-madrid-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52273,7 +52340,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52281,7 +52348,7 @@ cont { symbol { name: "subway-madrid-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52297,7 +52364,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52305,7 +52372,7 @@ cont { symbol { name: "subway-madrid-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52321,7 +52388,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52329,7 +52396,7 @@ cont { symbol { name: "subway-madrid-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52345,7 +52412,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52353,7 +52420,7 @@ cont { symbol { name: "subway-madrid-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52369,7 +52436,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -52380,7 +52447,7 @@ cont { symbol { name: "subway-minsk-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -52390,7 +52457,7 @@ cont { stroke_color: 1292964096 offset_y: 4 } - priority: 15918 + priority: 15910 } } element { @@ -52398,7 +52465,7 @@ cont { symbol { name: "subway-minsk-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -52415,7 +52482,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52423,7 +52490,7 @@ cont { symbol { name: "subway-minsk-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52439,15 +52506,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 16 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52461,15 +52528,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 17 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52483,15 +52550,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 18 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52505,15 +52572,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 19 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52527,7 +52594,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -52538,7 +52605,7 @@ cont { symbol { name: "subway-moscow-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -52547,7 +52614,7 @@ cont { symbol { name: "subway-moscow-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -52564,7 +52631,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52572,7 +52639,7 @@ cont { symbol { name: "subway-moscow-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -52589,7 +52656,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52597,7 +52664,7 @@ cont { symbol { name: "subway-moscow-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -52614,7 +52681,7 @@ cont { offset_y: 24 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52622,7 +52689,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52638,7 +52705,7 @@ cont { offset_y: 24 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52646,7 +52713,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52662,7 +52729,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52670,7 +52737,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52686,7 +52753,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52694,7 +52761,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52710,7 +52777,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52718,7 +52785,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52734,7 +52801,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -52745,7 +52812,7 @@ cont { symbol { name: "subway-newyork-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -52754,7 +52821,7 @@ cont { symbol { name: "subway-newyork-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -52771,7 +52838,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52779,7 +52846,7 @@ cont { symbol { name: "subway-newyork-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52795,7 +52862,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52803,7 +52870,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52819,7 +52886,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52827,7 +52894,7 @@ cont { symbol { name: "subway-newyork-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52843,7 +52910,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52851,7 +52918,7 @@ cont { symbol { name: "subway-newyork-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52867,7 +52934,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52875,7 +52942,7 @@ cont { symbol { name: "subway-newyork-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52891,7 +52958,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -52902,7 +52969,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -52911,7 +52978,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -52928,7 +52995,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52936,7 +53003,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52952,7 +53019,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52960,7 +53027,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -52976,7 +53043,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -52984,7 +53051,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53000,7 +53067,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53008,7 +53075,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53024,7 +53091,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53032,7 +53099,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53048,7 +53115,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -53059,7 +53126,7 @@ cont { symbol { name: "subway-paris-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -53068,7 +53135,7 @@ cont { symbol { name: "subway-paris-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -53085,7 +53152,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53093,7 +53160,7 @@ cont { symbol { name: "subway-paris-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53109,7 +53176,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53117,7 +53184,7 @@ cont { symbol { name: "subway-paris-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53133,7 +53200,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53141,7 +53208,7 @@ cont { symbol { name: "subway-paris-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53157,7 +53224,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53165,7 +53232,7 @@ cont { symbol { name: "subway-paris-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53181,7 +53248,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53189,7 +53256,7 @@ cont { symbol { name: "subway-paris-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53205,7 +53272,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -53216,7 +53283,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -53225,7 +53292,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -53242,7 +53309,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53250,7 +53317,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53266,7 +53333,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53274,7 +53341,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53290,7 +53357,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53298,7 +53365,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53314,7 +53381,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53322,7 +53389,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53338,7 +53405,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53346,7 +53413,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53362,7 +53429,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -53373,7 +53440,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -53382,7 +53449,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -53399,7 +53466,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53407,7 +53474,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53423,7 +53490,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53431,7 +53498,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53447,7 +53514,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53455,7 +53522,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53471,7 +53538,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53479,7 +53546,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53495,7 +53562,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53503,7 +53570,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53519,7 +53586,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -53530,7 +53597,7 @@ cont { symbol { name: "subway-rome-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -53539,7 +53606,7 @@ cont { symbol { name: "subway-rome-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -53556,7 +53623,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53564,7 +53631,7 @@ cont { symbol { name: "subway-rome-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53580,7 +53647,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53588,7 +53655,7 @@ cont { symbol { name: "subway-rome-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53604,15 +53671,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 17 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53626,15 +53693,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 18 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53648,15 +53715,15 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { scale: 19 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53670,7 +53737,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -53681,7 +53748,7 @@ cont { symbol { name: "subway-spb-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -53690,7 +53757,7 @@ cont { symbol { name: "subway-spb-s" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53706,7 +53773,7 @@ cont { offset_y: 5 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53714,7 +53781,7 @@ cont { symbol { name: "subway-spb-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -53731,7 +53798,7 @@ cont { offset_y: 5 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53739,7 +53806,7 @@ cont { symbol { name: "subway-spb-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -53756,7 +53823,7 @@ cont { offset_y: 24 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53764,7 +53831,7 @@ cont { symbol { name: "subway-spb-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53780,7 +53847,7 @@ cont { offset_y: 24 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53788,7 +53855,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53804,7 +53871,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53812,7 +53879,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53828,7 +53895,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53836,7 +53903,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53852,7 +53919,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53860,7 +53927,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53876,7 +53943,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -53887,7 +53954,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -53896,7 +53963,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -53913,7 +53980,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53921,7 +53988,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53937,7 +54004,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53945,7 +54012,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53961,7 +54028,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53969,7 +54036,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -53985,7 +54052,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -53993,7 +54060,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54009,7 +54076,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -54017,7 +54084,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54033,7 +54100,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -54044,7 +54111,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } } @@ -54053,7 +54120,7 @@ cont { symbol { name: "subway-s" apply_for_type: 1 - priority: 16918 + priority: 16910 min_distance: 1 } caption { @@ -54070,7 +54137,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -54078,7 +54145,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54094,7 +54161,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -54102,7 +54169,7 @@ cont { symbol { name: "subway-m" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54118,7 +54185,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -54126,7 +54193,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54142,7 +54209,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -54150,7 +54217,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54166,7 +54233,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } element { @@ -54174,7 +54241,7 @@ cont { symbol { name: "subway-l" apply_for_type: 1 - priority: 16918 + priority: 16910 } caption { primary { @@ -54190,7 +54257,7 @@ cont { offset_y: 7 text: "int_name" } - priority: 15918 + priority: 15910 } } } @@ -54211,7 +54278,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54219,7 +54286,7 @@ cont { symbol { name: "subway-entrance-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54235,7 +54302,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54243,7 +54310,7 @@ cont { symbol { name: "subway-entrance-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54259,7 +54326,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54267,7 +54334,7 @@ cont { symbol { name: "subway-entrance-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54283,7 +54350,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -54304,7 +54371,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54312,7 +54379,7 @@ cont { symbol { name: "subway-barcelona-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54328,7 +54395,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54336,7 +54403,7 @@ cont { symbol { name: "subway-barcelona-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54352,7 +54419,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54360,7 +54427,7 @@ cont { symbol { name: "subway-barcelona-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54376,7 +54443,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -54397,7 +54464,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54405,7 +54472,7 @@ cont { symbol { name: "subway-berlin-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54421,7 +54488,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54429,7 +54496,7 @@ cont { symbol { name: "subway-berlin-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54445,7 +54512,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54453,7 +54520,7 @@ cont { symbol { name: "subway-berlin-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54469,7 +54536,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -54490,7 +54557,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54498,7 +54565,7 @@ cont { symbol { name: "subway-kiev-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54514,7 +54581,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54522,7 +54589,7 @@ cont { symbol { name: "subway-kiev-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54538,7 +54605,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54546,7 +54613,7 @@ cont { symbol { name: "subway-kiev-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54562,7 +54629,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -54583,7 +54650,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54591,7 +54658,7 @@ cont { symbol { name: "subway-london-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54607,7 +54674,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54615,7 +54682,7 @@ cont { symbol { name: "subway-london-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54631,7 +54698,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54639,7 +54706,7 @@ cont { symbol { name: "subway-london-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54655,7 +54722,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -54676,7 +54743,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54684,7 +54751,7 @@ cont { symbol { name: "subway-madrid-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54700,7 +54767,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54708,7 +54775,7 @@ cont { symbol { name: "subway-madrid-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54724,7 +54791,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54732,7 +54799,7 @@ cont { symbol { name: "subway-madrid-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54748,7 +54815,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -54769,7 +54836,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54777,7 +54844,7 @@ cont { symbol { name: "subway-minsk-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54793,7 +54860,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54801,7 +54868,7 @@ cont { symbol { name: "subway-minsk-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54817,7 +54884,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54825,7 +54892,7 @@ cont { symbol { name: "subway-minsk-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54841,7 +54908,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -54852,7 +54919,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54868,7 +54935,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54876,7 +54943,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54892,7 +54959,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54900,7 +54967,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54916,7 +54983,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54924,7 +54991,7 @@ cont { symbol { name: "subway-moscow-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54940,7 +55007,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -54961,7 +55028,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54969,7 +55036,7 @@ cont { symbol { name: "subway-newyork-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -54985,7 +55052,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -54993,7 +55060,7 @@ cont { symbol { name: "subway-newyork-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55009,7 +55076,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55017,7 +55084,7 @@ cont { symbol { name: "subway-newyork-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55033,7 +55100,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -55054,7 +55121,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55062,7 +55129,7 @@ cont { symbol { name: "subway-paris-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55078,7 +55145,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55086,7 +55153,7 @@ cont { symbol { name: "subway-paris-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55102,7 +55169,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55110,7 +55177,7 @@ cont { symbol { name: "subway-paris-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55126,7 +55193,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -55147,7 +55214,7 @@ cont { offset_y: 20 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55155,7 +55222,7 @@ cont { symbol { name: "subway-rome-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55171,7 +55238,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55179,7 +55246,7 @@ cont { symbol { name: "subway-rome-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55195,7 +55262,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55203,7 +55270,7 @@ cont { symbol { name: "subway-rome-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55219,7 +55286,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -55230,7 +55297,7 @@ cont { symbol { name: "subway-spb-m" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55246,7 +55313,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55254,7 +55321,7 @@ cont { symbol { name: "subway-spb-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55270,7 +55337,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55278,7 +55345,7 @@ cont { symbol { name: "subway-spb-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55294,7 +55361,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15657 + priority: 15722 } } element { @@ -55302,7 +55369,7 @@ cont { symbol { name: "subway-spb-l" apply_for_type: 1 - priority: 16657 + priority: 16722 } caption { primary { @@ -55318,7 +55385,7 @@ cont { offset_y: 25 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -55329,7 +55396,7 @@ cont { lines { width: 0.6 color: 1717328977 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -55339,7 +55406,7 @@ cont { lines { width: 0.6 color: 1717328977 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -55349,7 +55416,7 @@ cont { lines { width: 0.7 color: 861690961 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -55359,7 +55426,7 @@ cont { lines { width: 0.8 color: 442260561 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55369,7 +55436,7 @@ cont { lines { width: 1.0 color: 6052945 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55379,7 +55446,7 @@ cont { lines { width: 1.0 color: 6052945 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55389,7 +55456,7 @@ cont { lines { width: 1.0 color: 6052945 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55402,7 +55469,7 @@ cont { lines { width: 0.6 color: 1717328977 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -55412,7 +55479,7 @@ cont { lines { width: 0.6 color: 1717328977 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -55422,7 +55489,7 @@ cont { lines { width: 0.7 color: 861690961 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -55432,7 +55499,7 @@ cont { lines { width: 0.8 color: 442260561 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55442,7 +55509,7 @@ cont { lines { width: 1.0 color: 6052945 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55452,7 +55519,7 @@ cont { lines { width: 1.0 color: 6052945 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55462,7 +55529,7 @@ cont { lines { width: 1.0 color: 6052945 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55475,7 +55542,7 @@ cont { lines { width: 0.6 color: 1717328977 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -55485,7 +55552,7 @@ cont { lines { width: 0.6 color: 1717328977 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -55495,7 +55562,7 @@ cont { lines { width: 0.7 color: 861690961 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: BUTTCAP } @@ -55505,7 +55572,7 @@ cont { lines { width: 0.8 color: 442260561 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55515,7 +55582,7 @@ cont { lines { width: 1.0 color: 6052945 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55525,7 +55592,7 @@ cont { lines { width: 1.0 color: 6052945 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55535,7 +55602,7 @@ cont { lines { width: 1.0 color: 6052945 - priority: 1405 + priority: 1445 join: ROUNDJOIN cap: ROUNDCAP } @@ -55548,28 +55615,28 @@ cont { symbol { name: "tram-s" apply_for_type: 1 - priority: 16657 + priority: 16722 } } element { scale: 15 symbol { name: "tram-m" - priority: 16657 + priority: 16722 } } element { scale: 16 symbol { name: "tram-m" - priority: 16657 + priority: 16722 } } element { scale: 17 symbol { name: "tram-l" - priority: 16657 + priority: 16722 } caption { primary { @@ -55585,14 +55652,14 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { scale: 18 symbol { name: "tram-l" - priority: 16657 + priority: 16722 } caption { primary { @@ -55608,14 +55675,14 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } element { scale: 19 symbol { name: "tram-l" - priority: 16657 + priority: 16722 } caption { primary { @@ -55631,7 +55698,7 @@ cont { offset_y: 8 text: "int_name" } - priority: 15657 + priority: 15722 } } } @@ -55642,7 +55709,7 @@ cont { lines { width: 0.6 color: 3355443 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -55652,7 +55719,7 @@ cont { lines { width: 0.6 color: 3355443 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -55662,7 +55729,7 @@ cont { lines { width: 0.8 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -55672,7 +55739,7 @@ cont { lines { width: 1.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -55682,7 +55749,7 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -55692,7 +55759,7 @@ cont { lines { width: 2.6 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -55703,7 +55770,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -55713,7 +55780,7 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -55724,7 +55791,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -55734,7 +55801,7 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -55745,7 +55812,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -55755,7 +55822,7 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -55766,7 +55833,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -55779,7 +55846,7 @@ cont { lines { width: 0.6 color: 3355443 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -55789,7 +55856,7 @@ cont { lines { width: 0.6 color: 3355443 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -55799,7 +55866,7 @@ cont { lines { width: 0.8 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -55809,14 +55876,14 @@ cont { lines { width: 1.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.0 color: 2236945 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -55826,14 +55893,14 @@ cont { lines { width: 1.2 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } lines { width: 4.4 color: 2236945 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } @@ -55843,21 +55910,21 @@ cont { lines { width: 2.6 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 5.0 color: 2236945 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } lines { width: 5.4 color: 4473924 - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -55868,7 +55935,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -55878,21 +55945,21 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 6.8 color: 2236945 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } lines { width: 7.2 color: 4473924 - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -55903,7 +55970,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -55913,21 +55980,21 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 2236945 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 4473924 - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -55938,7 +56005,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -55948,21 +56015,21 @@ cont { lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } lines { width: 8.0 color: 2236945 - priority: 1071 + priority: 1078 join: ROUNDJOIN cap: BUTTCAP } lines { width: 8.4 color: 4473924 - priority: 1062 + priority: 1068 join: ROUNDJOIN cap: BUTTCAP } @@ -55973,7 +56040,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -55986,7 +56053,7 @@ cont { lines { width: 0.6 color: 3355443 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -55996,7 +56063,7 @@ cont { lines { width: 0.6 color: 3355443 - priority: 1306 + priority: 1336 join: BEVELJOIN cap: BUTTCAP } @@ -56006,7 +56073,7 @@ cont { lines { width: 0.8 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -56020,14 +56087,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -56041,14 +56108,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 1.2 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: BUTTCAP } @@ -56062,14 +56129,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 2.6 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -56080,7 +56147,7 @@ cont { dd: 4.5 dd: 4.5 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -56094,14 +56161,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -56112,7 +56179,7 @@ cont { dd: 6.3 dd: 6.3 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -56126,14 +56193,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -56144,7 +56211,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -56158,14 +56225,14 @@ cont { dd: 5.0 dd: 5.0 } - priority: 1305 + priority: 1335 join: ROUNDJOIN cap: BUTTCAP } lines { width: 3.0 color: 3355443 - priority: 1306 + priority: 1336 join: ROUNDJOIN cap: ROUNDCAP } @@ -56176,7 +56243,7 @@ cont { dd: 8.1 dd: 8.1 } - priority: 1315 + priority: 1346 join: ROUNDJOIN cap: ROUNDCAP } @@ -56193,7 +56260,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: BEVELJOIN cap: BUTTCAP } @@ -56202,7 +56269,7 @@ cont { height: 9 color: 19033 } - priority: 16171 + priority: 16188 } } element { @@ -56214,7 +56281,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: BEVELJOIN cap: BUTTCAP } @@ -56223,7 +56290,7 @@ cont { height: 9 color: 19033 } - priority: 16171 + priority: 16188 } } element { @@ -56235,7 +56302,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: BEVELJOIN cap: BUTTCAP } @@ -56244,7 +56311,7 @@ cont { height: 9 color: 19033 } - priority: 16171 + priority: 16188 } } element { @@ -56256,7 +56323,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: BUTTCAP } @@ -56265,7 +56332,7 @@ cont { height: 9 color: 19033 } - priority: 16171 + priority: 16188 } } element { @@ -56277,7 +56344,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: BUTTCAP } @@ -56286,7 +56353,7 @@ cont { height: 9 color: 19033 } - priority: 16171 + priority: 16188 } } element { @@ -56298,7 +56365,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: BUTTCAP } @@ -56307,7 +56374,7 @@ cont { height: 9 color: 19033 } - priority: 16171 + priority: 16188 } } element { @@ -56319,7 +56386,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56328,7 +56395,7 @@ cont { height: 9 color: 19033 } - priority: 16171 + priority: 16188 } } element { @@ -56340,7 +56407,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56349,7 +56416,7 @@ cont { height: 10 color: 19033 } - priority: 16171 + priority: 16188 } } element { @@ -56361,7 +56428,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56370,7 +56437,7 @@ cont { height: 10 color: 19033 } - priority: 16171 + priority: 16188 } } element { @@ -56382,7 +56449,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56391,7 +56458,7 @@ cont { height: 10 color: 19033 } - priority: 16171 + priority: 16188 } } } @@ -56406,7 +56473,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: BEVELJOIN cap: BUTTCAP } @@ -56415,7 +56482,7 @@ cont { height: 9 color: 19033 } - priority: 16171 + priority: 16188 } } element { @@ -56427,7 +56494,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: BEVELJOIN cap: BUTTCAP } @@ -56436,7 +56503,7 @@ cont { height: 9 color: 19033 } - priority: 16171 + priority: 16188 } } element { @@ -56448,7 +56515,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: BEVELJOIN cap: BUTTCAP } @@ -56457,7 +56524,7 @@ cont { height: 9 color: 19033 } - priority: 16171 + priority: 16188 } } element { @@ -56469,7 +56536,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: BUTTCAP } @@ -56478,7 +56545,7 @@ cont { height: 9 color: 19033 } - priority: 16171 + priority: 16188 } } element { @@ -56490,7 +56557,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: BUTTCAP } @@ -56499,7 +56566,7 @@ cont { height: 9 color: 19033 } - priority: 16171 + priority: 16188 } } element { @@ -56511,7 +56578,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: BUTTCAP } @@ -56520,7 +56587,7 @@ cont { height: 9 color: 19033 } - priority: 16171 + priority: 16188 } } element { @@ -56532,7 +56599,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56541,7 +56608,7 @@ cont { height: 9 color: 19033 } - priority: 16171 + priority: 16188 } } element { @@ -56553,7 +56620,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56562,7 +56629,7 @@ cont { height: 10 color: 19033 } - priority: 16171 + priority: 16188 } } element { @@ -56574,7 +56641,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56583,7 +56650,7 @@ cont { height: 10 color: 19033 } - priority: 16171 + priority: 16188 } } element { @@ -56595,7 +56662,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56604,7 +56671,7 @@ cont { height: 10 color: 19033 } - priority: 16171 + priority: 16188 } } } @@ -56619,7 +56686,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: BEVELJOIN cap: BUTTCAP } @@ -56628,7 +56695,7 @@ cont { height: 9 color: 19033 } - priority: 16171 + priority: 16188 } } element { @@ -56640,7 +56707,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: BEVELJOIN cap: BUTTCAP } @@ -56649,7 +56716,7 @@ cont { height: 9 color: 19033 } - priority: 16171 + priority: 16188 } } element { @@ -56661,7 +56728,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: BEVELJOIN cap: BUTTCAP } @@ -56670,7 +56737,7 @@ cont { height: 9 color: 19033 } - priority: 16171 + priority: 16188 } } element { @@ -56682,7 +56749,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: BUTTCAP } @@ -56691,7 +56758,7 @@ cont { height: 9 color: 19033 } - priority: 16171 + priority: 16188 } } element { @@ -56703,7 +56770,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: BUTTCAP } @@ -56712,7 +56779,7 @@ cont { height: 9 color: 19033 } - priority: 16171 + priority: 16188 } } element { @@ -56724,7 +56791,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: BUTTCAP } @@ -56733,7 +56800,7 @@ cont { height: 9 color: 19033 } - priority: 16171 + priority: 16188 } } element { @@ -56745,7 +56812,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56754,7 +56821,7 @@ cont { height: 9 color: 19033 } - priority: 16171 + priority: 16188 } } element { @@ -56766,7 +56833,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56775,7 +56842,7 @@ cont { height: 10 color: 19033 } - priority: 16171 + priority: 16188 } } element { @@ -56787,7 +56854,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56796,7 +56863,7 @@ cont { height: 10 color: 19033 } - priority: 16171 + priority: 16188 } } element { @@ -56808,7 +56875,7 @@ cont { dd: 5.4 dd: 2.7 } - priority: 1171 + priority: 1188 join: ROUNDJOIN cap: ROUNDCAP } @@ -56817,7 +56884,7 @@ cont { height: 10 color: 19033 } - priority: 16171 + priority: 16188 } } } @@ -56827,7 +56894,7 @@ cont { scale: 16 symbol { name: "shop-m" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -56836,14 +56903,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -56852,14 +56919,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -56868,14 +56935,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -56884,7 +56951,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -56893,8 +56960,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "alcohol-m" + priority: 16594 min_distance: 10 } caption { @@ -56903,14 +56970,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "alcohol-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -56919,14 +56986,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "alcohol-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -56935,14 +57002,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "alcohol-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -56951,7 +57018,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -56960,8 +57027,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "bakery-m" + priority: 16594 min_distance: 10 } caption { @@ -56970,14 +57037,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "bakery-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -56986,14 +57053,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "bakery-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57002,14 +57069,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "bakery-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57018,7 +57085,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57027,8 +57094,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "beauty-m" + priority: 16594 min_distance: 10 } caption { @@ -57037,14 +57104,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "beauty-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57053,14 +57120,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "beauty-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57069,14 +57136,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "beauty-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57085,7 +57152,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57094,8 +57161,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "alcohol-m" + priority: 16594 min_distance: 10 } caption { @@ -57104,14 +57171,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "alcohol-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57120,14 +57187,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "alcohol-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57136,14 +57203,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "alcohol-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57152,7 +57219,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57161,8 +57228,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "shop-bicycle-m" + priority: 16594 min_distance: 10 } caption { @@ -57171,14 +57238,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "shop-bicycle-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57187,14 +57254,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "shop-bicycle-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57203,14 +57270,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "shop-bicycle-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57219,7 +57286,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57228,8 +57295,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "bookmaker-m" + priority: 16594 min_distance: 10 } caption { @@ -57238,14 +57305,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "bookmaker-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57254,14 +57321,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "bookmaker-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57270,14 +57337,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "bookmaker-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57286,7 +57353,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57295,8 +57362,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "book-shop-m" + priority: 16594 min_distance: 10 } caption { @@ -57305,14 +57372,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "book-shop-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57321,14 +57388,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "book-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57337,14 +57404,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "book-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57353,7 +57420,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57362,8 +57429,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "butcher-m" + priority: 16594 min_distance: 10 } caption { @@ -57372,14 +57439,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "butcher-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57388,14 +57455,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "butcher-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57404,14 +57471,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "butcher-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57420,7 +57487,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57429,8 +57496,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "car_shop-m" + priority: 16594 min_distance: 10 } caption { @@ -57439,14 +57506,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "car_shop-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57455,14 +57522,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "car_shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57471,14 +57538,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "car_shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57487,7 +57554,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57496,8 +57563,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "car-part-m" + priority: 16594 min_distance: 10 } caption { @@ -57506,14 +57573,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "car-part-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57522,14 +57589,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "car-part-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57538,14 +57605,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "car-part-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57554,7 +57621,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57563,8 +57630,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "car-repair-m" + priority: 16594 min_distance: 10 } caption { @@ -57573,14 +57640,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "car-repair-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57589,14 +57656,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "car-repair-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57605,14 +57672,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "car-repair-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57621,7 +57688,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57631,7 +57698,7 @@ cont { scale: 15 symbol { name: "car-repair-s" - priority: 16594 + priority: 16653 min_distance: 20 } caption { @@ -57646,8 +57713,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16594 + name: "car-repair-m" + priority: 16653 min_distance: 10 } caption { @@ -57663,7 +57730,7 @@ cont { scale: 17 symbol { name: "car-repair-l" - priority: 16594 + priority: 16653 min_distance: 24 } caption { @@ -57672,14 +57739,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "car-repair-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -57688,14 +57755,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "car-repair-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -57704,7 +57771,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -57713,8 +57780,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "chemist-m" + priority: 16594 min_distance: 10 } caption { @@ -57723,14 +57790,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "chemist-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57739,14 +57806,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "chemist-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57755,14 +57822,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "chemist-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57771,7 +57838,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57780,8 +57847,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "clothes-m" + priority: 16594 min_distance: 10 } caption { @@ -57790,14 +57857,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "clothes-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57806,14 +57873,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "clothes-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57822,14 +57889,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "clothes-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57838,7 +57905,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57848,7 +57915,7 @@ cont { scale: 16 symbol { name: "shop-m" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57857,14 +57924,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57873,14 +57940,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57889,14 +57956,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57905,7 +57972,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57914,8 +57981,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "computer-m" + priority: 16594 min_distance: 10 } caption { @@ -57924,14 +57991,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "computer-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -57940,14 +58007,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "computer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57956,14 +58023,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "computer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -57972,7 +58039,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -57981,8 +58048,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "sweets-m" + priority: 16594 min_distance: 10 } caption { @@ -57991,14 +58058,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "sweets-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58007,14 +58074,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "sweets-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58023,14 +58090,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "sweets-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58039,7 +58106,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58048,8 +58115,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "grocery-m" + priority: 16594 min_distance: 10 } caption { @@ -58058,14 +58125,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "grocery-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58074,14 +58141,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "grocery-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58090,14 +58157,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "grocery-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58106,7 +58173,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58115,8 +58182,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "copyshop-m" + priority: 16594 min_distance: 10 } caption { @@ -58125,14 +58192,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "copyshop-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58141,14 +58208,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "copyshop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58157,14 +58224,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "copyshop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58173,7 +58240,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58182,8 +58249,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "beauty-m" + priority: 16594 min_distance: 10 } caption { @@ -58192,14 +58259,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "beauty-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58208,14 +58275,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "beauty-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58224,14 +58291,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "beauty-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58240,7 +58307,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58249,8 +58316,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "department_store-m" + priority: 16594 min_distance: 10 } caption { @@ -58259,14 +58326,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "department_store-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58275,14 +58342,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "department_store-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58291,14 +58358,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "department_store-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58307,7 +58374,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58316,8 +58383,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "doityourself-m" + priority: 16594 min_distance: 10 } caption { @@ -58326,14 +58393,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "doityourself-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58342,14 +58409,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "doityourself-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58358,14 +58425,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "doityourself-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58374,7 +58441,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58383,8 +58450,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "laundry-m" + priority: 16594 min_distance: 10 } caption { @@ -58393,14 +58460,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "laundry-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58409,14 +58476,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "laundry-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58425,14 +58492,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "laundry-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58441,7 +58508,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58450,8 +58517,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "electronics-m" + priority: 16594 min_distance: 10 } caption { @@ -58460,14 +58527,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "electronics-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58476,14 +58543,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "electronics-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58492,14 +58559,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "electronics-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58508,7 +58575,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58517,8 +58584,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "florist-m" + priority: 16594 min_distance: 10 } caption { @@ -58527,14 +58594,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "florist-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58543,14 +58610,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "florist-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58559,14 +58626,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "florist-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58575,7 +58642,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58584,8 +58651,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "furniture-m" + priority: 16594 min_distance: 10 } caption { @@ -58594,14 +58661,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "furniture-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58610,14 +58677,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "furniture-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58626,14 +58693,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "furniture-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58642,7 +58709,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58651,8 +58718,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "garden_center-m" + priority: 16594 min_distance: 10 } caption { @@ -58661,14 +58728,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "garden_center-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58677,14 +58744,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "garden_center-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58693,14 +58760,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "garden_center-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58709,7 +58776,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58718,8 +58785,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "gift-m" + priority: 16594 min_distance: 10 } caption { @@ -58728,14 +58795,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "gift-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58744,14 +58811,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "gift-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58760,14 +58827,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "gift-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58776,7 +58843,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58785,8 +58852,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "greengrocer-m" + priority: 16594 min_distance: 10 } caption { @@ -58795,14 +58862,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "greengrocer-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58811,14 +58878,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "greengrocer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58827,14 +58894,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "greengrocer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58843,7 +58910,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58852,8 +58919,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "hairdresser-m" + priority: 16594 min_distance: 10 } caption { @@ -58862,14 +58929,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "hairdresser-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58878,14 +58945,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "hairdresser-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58894,14 +58961,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "hairdresser-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58910,7 +58977,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58919,8 +58986,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "doityourself-m" + priority: 16594 min_distance: 10 } caption { @@ -58929,14 +58996,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "doityourself-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -58945,14 +59012,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "doityourself-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58961,14 +59028,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "doityourself-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -58977,7 +59044,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -58986,8 +59053,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "jewelry-m" + priority: 16594 min_distance: 10 } caption { @@ -58996,14 +59063,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "jewelry-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59012,14 +59079,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "jewelry-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59028,14 +59095,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "jewelry-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59044,7 +59111,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59053,8 +59120,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "kiosk-m" + priority: 16594 min_distance: 10 } caption { @@ -59063,14 +59130,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "kiosk-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59079,14 +59146,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "kiosk-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59095,14 +59162,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "kiosk-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59111,7 +59178,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59120,8 +59187,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "laundry-m" + priority: 16594 min_distance: 10 } caption { @@ -59130,14 +59197,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "laundry-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59146,14 +59213,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "laundry-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59162,14 +59229,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "laundry-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59178,7 +59245,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59188,7 +59255,7 @@ cont { scale: 14 symbol { name: "shop-s" - priority: 16936 + priority: 16930 min_distance: 16 } caption { @@ -59197,14 +59264,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15936 + priority: 15930 } } element { scale: 15 symbol { name: "shop-m" - priority: 16936 + priority: 16930 min_distance: 16 } caption { @@ -59213,14 +59280,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15936 + priority: 15930 } } element { scale: 16 symbol { name: "shop-m" - priority: 16936 + priority: 16930 min_distance: 10 } caption { @@ -59229,14 +59296,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15936 + priority: 15930 } } element { scale: 17 symbol { name: "shop-l" - priority: 16936 + priority: 16930 min_distance: 10 } caption { @@ -59245,14 +59312,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15936 + priority: 15930 } } element { scale: 18 symbol { name: "shop-l" - priority: 16936 + priority: 16930 min_distance: 10 } caption { @@ -59261,14 +59328,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15936 + priority: 15930 } } element { scale: 19 symbol { name: "shop-l" - priority: 16936 + priority: 16930 min_distance: 10 } caption { @@ -59277,7 +59344,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15936 + priority: 15930 } } } @@ -59286,8 +59353,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "mobile_phone-m" + priority: 16594 min_distance: 10 } caption { @@ -59296,14 +59363,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "mobile_phone-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59312,14 +59379,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "mobile_phone-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59328,14 +59395,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "mobile_phone-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59344,7 +59411,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59353,8 +59420,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "optician-m" + priority: 16594 min_distance: 10 } caption { @@ -59363,14 +59430,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "optician-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59379,14 +59446,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "optician-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59395,14 +59462,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "optician-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59411,7 +59478,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59420,8 +59487,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "outdoor-shop-m" + priority: 16594 min_distance: 10 } caption { @@ -59430,14 +59497,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "outdoor-shop-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59446,14 +59513,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "outdoor-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59462,14 +59529,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "outdoor-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59478,7 +59545,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59487,8 +59554,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "petshop-m" + priority: 16594 min_distance: 10 } caption { @@ -59497,14 +59564,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "petshop-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59513,14 +59580,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "petshop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59529,14 +59596,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "petshop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59545,7 +59612,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59554,8 +59621,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "photo-shop-m" + priority: 16594 min_distance: 10 } caption { @@ -59564,14 +59631,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "photo-shop-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59580,14 +59647,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "photo-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59596,14 +59663,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "photo-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59612,7 +59679,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59621,8 +59688,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "seafood-shop-m" + priority: 16594 min_distance: 10 } caption { @@ -59631,14 +59698,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "seafood-shop-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59647,14 +59714,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "seafood-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59663,14 +59730,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "seafood-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59679,7 +59746,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59688,8 +59755,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "shoes-m" + priority: 16594 min_distance: 10 } caption { @@ -59698,14 +59765,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "shoes-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59714,14 +59781,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "shoes-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59730,14 +59797,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "shoes-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59746,7 +59813,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59755,8 +59822,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "sports-m" + priority: 16594 min_distance: 10 } caption { @@ -59765,14 +59832,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "sports-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59781,14 +59848,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "sports-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59797,14 +59864,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "sports-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59813,7 +59880,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59823,7 +59890,7 @@ cont { scale: 16 symbol { name: "shop-m" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -59832,14 +59899,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 17 symbol { name: "shop-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -59848,14 +59915,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 18 symbol { name: "shop-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -59864,14 +59931,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } element { scale: 19 symbol { name: "shop-l" - priority: 16594 + priority: 16653 min_distance: 10 } caption { @@ -59880,7 +59947,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15594 + priority: 15653 } } } @@ -59890,7 +59957,7 @@ cont { scale: 16 symbol { name: "shop-m" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59899,14 +59966,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59915,14 +59982,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59931,14 +59998,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59947,7 +60014,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -59956,8 +60023,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "ticket-shop-m" + priority: 16594 min_distance: 10 } caption { @@ -59966,14 +60033,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "ticket-shop-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -59982,14 +60049,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "ticket-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -59998,14 +60065,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "ticket-shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60014,7 +60081,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -60023,8 +60090,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "toys-m" + priority: 16594 min_distance: 10 } caption { @@ -60033,14 +60100,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "toys-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -60049,14 +60116,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "toys-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60065,14 +60132,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "toys-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60081,7 +60148,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -60091,7 +60158,7 @@ cont { scale: 16 symbol { name: "shop-m" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60100,14 +60167,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60116,14 +60183,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60132,14 +60199,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "shop-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60148,7 +60215,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -60157,8 +60224,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "car-repair-m" + priority: 16594 min_distance: 10 } caption { @@ -60167,14 +60234,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "car-repair-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -60183,14 +60250,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "car-repair-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60199,14 +60266,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "car-repair-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60215,7 +60282,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -60224,8 +60291,8 @@ cont { element { scale: 16 symbol { - name: "shop-m" - priority: 16540 + name: "alcohol-m" + priority: 16594 min_distance: 10 } caption { @@ -60234,14 +60301,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "alcohol-l" - priority: 16540 + priority: 16594 min_distance: 24 } caption { @@ -60250,14 +60317,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "alcohol-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60266,14 +60333,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "alcohol-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60282,45 +60349,560 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } +cont { + name: "sponsored-booking" + element { + scale: 14 + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 10 + } + priority: 15782 + } + apply_if: "rating>=5" + } + element { + scale: 14 + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 10 + } + priority: 15792 + } + apply_if: "rating>=6" + } + element { + scale: 14 + symbol { + name: "hotel-s" + apply_for_type: 1 + priority: 16801 + min_distance: 24 + } + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 6 + } + priority: 15801 + } + apply_if: "rating>=7" + } + element { + scale: 14 + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 10 + } + priority: 15811 + } + apply_if: "rating>=8" + } + element { + scale: 14 + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 10 + } + priority: 15821 + } + apply_if: "rating>=9" + } + element { + scale: 15 + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 10 + } + priority: 15782 + } + apply_if: "rating>=5" + } + element { + scale: 15 + symbol { + name: "hotel-m" + apply_for_type: 1 + priority: 16792 + min_distance: 32 + } + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 10 + } + priority: 15792 + } + apply_if: "rating>=6" + } + element { + scale: 15 + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 10 + } + priority: 15801 + } + apply_if: "rating>=7" + } + element { + scale: 15 + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 10 + } + priority: 15811 + } + apply_if: "rating>=8" + } + element { + scale: 15 + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 10 + } + priority: 15821 + } + apply_if: "rating>=9" + } + element { + scale: 16 + symbol { + name: "hotel-m" + apply_for_type: 1 + priority: 16782 + min_distance: 24 + } + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 10 + } + priority: 15782 + } + apply_if: "rating>=5" + } + element { + scale: 16 + symbol { + name: "hotel-m" + apply_for_type: 1 + priority: 16792 + min_distance: 24 + } + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 10 + } + priority: 15792 + } + apply_if: "rating>=6" + } + element { + scale: 16 + symbol { + name: "hotel-m" + apply_for_type: 1 + priority: 16801 + min_distance: 24 + } + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 10 + } + priority: 15801 + } + apply_if: "rating>=7" + } + element { + scale: 16 + symbol { + name: "hotel-m" + apply_for_type: 1 + priority: 16811 + min_distance: 24 + } + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 10 + } + priority: 15811 + } + apply_if: "rating>=8" + } + element { + scale: 16 + symbol { + name: "hotel-m" + apply_for_type: 1 + priority: 16821 + min_distance: 24 + } + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 10 + } + priority: 15821 + } + apply_if: "rating>=9" + } + element { + scale: 17 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16782 + min_distance: 16 + } + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 10 + } + priority: 15782 + } + apply_if: "rating>=5" + } + element { + scale: 17 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16792 + min_distance: 16 + } + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 10 + } + priority: 15792 + } + apply_if: "rating>=6" + } + element { + scale: 17 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16801 + min_distance: 16 + } + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 10 + } + priority: 15801 + } + apply_if: "rating>=7" + } + element { + scale: 17 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16811 + min_distance: 16 + } + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 10 + } + priority: 15811 + } + apply_if: "rating>=8" + } + element { + scale: 17 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16821 + min_distance: 16 + } + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 10 + } + priority: 15821 + } + apply_if: "rating>=9" + } + element { + scale: 18 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16782 + } + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 10 + } + priority: 15782 + } + apply_if: "rating>=5" + } + element { + scale: 18 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16792 + } + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 10 + } + priority: 15792 + } + apply_if: "rating>=6" + } + element { + scale: 18 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16801 + } + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 10 + } + priority: 15801 + } + apply_if: "rating>=7" + } + element { + scale: 18 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16811 + } + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 10 + } + priority: 15811 + } + apply_if: "rating>=8" + } + element { + scale: 18 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16821 + } + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 10 + } + priority: 15821 + } + apply_if: "rating>=9" + } + element { + scale: 19 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16782 + } + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 10 + } + priority: 15782 + } + apply_if: "rating>=5" + } + element { + scale: 19 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16792 + } + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 10 + } + priority: 15792 + } + apply_if: "rating>=6" + } + element { + scale: 19 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16801 + } + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 10 + } + priority: 15801 + } + apply_if: "rating>=7" + } + element { + scale: 19 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16811 + } + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 10 + } + priority: 15811 + } + apply_if: "rating>=8" + } + element { + scale: 19 + symbol { + name: "hotel-l" + apply_for_type: 1 + priority: 16821 + } + caption { + primary { + height: 10 + color: 5592405 + stroke_color: 856756497 + offset_y: 10 + } + priority: 15821 + } + apply_if: "rating>=9" + } +} cont { name: "sponsored-tinkoff" element { scale: 14 symbol { name: "atm-tinkoff-shield-l" - priority: 16576 + priority: 16633 } } element { scale: 15 symbol { name: "atm-tinkoff-shield-l" - priority: 16576 + priority: 16633 } } element { scale: 16 symbol { name: "atm-tinkoff-shield-l" - priority: 16576 + priority: 16633 } } element { scale: 17 symbol { name: "atm-tinkoff-shield-l" - priority: 16576 + priority: 16633 } } element { scale: 18 symbol { name: "atm-tinkoff-shield-l" - priority: 16576 + priority: 16633 } caption { primary { @@ -60328,14 +60910,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15576 + priority: 15633 } } element { scale: 19 symbol { name: "atm-tinkoff-shield-l" - priority: 16576 + priority: 16633 } caption { primary { @@ -60343,7 +60925,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15576 + priority: 15633 } } } @@ -60357,7 +60939,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -60365,7 +60947,7 @@ cont { symbol { name: "america-football-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -60373,7 +60955,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15558 + priority: 15613 } } element { @@ -60381,7 +60963,7 @@ cont { symbol { name: "america-football-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -60389,7 +60971,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15558 + priority: 15613 } } } @@ -60399,7 +60981,7 @@ cont { scale: 17 symbol { name: "archery-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60408,14 +60990,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "archery-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -60424,14 +61006,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15549 + priority: 15603 } } element { scale: 19 symbol { name: "archery-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -60440,7 +61022,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15549 + priority: 15603 } } } @@ -60454,7 +61036,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -60462,7 +61044,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -60470,7 +61052,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15558 + priority: 15613 } } element { @@ -60478,7 +61060,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -60486,7 +61068,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15558 + priority: 15613 } } } @@ -60496,7 +61078,7 @@ cont { scale: 17 symbol { name: "australian-football-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60505,14 +61087,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "australian-football-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -60521,14 +61103,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15549 + priority: 15603 } } element { scale: 19 symbol { name: "australian-football-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -60537,7 +61119,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15549 + priority: 15603 } } } @@ -60551,7 +61133,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -60559,7 +61141,7 @@ cont { symbol { name: "baseball-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -60567,7 +61149,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15558 + priority: 15613 } } element { @@ -60575,7 +61157,7 @@ cont { symbol { name: "baseball-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -60583,7 +61165,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15558 + priority: 15613 } } } @@ -60597,7 +61179,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -60605,7 +61187,7 @@ cont { symbol { name: "basketball-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -60613,7 +61195,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15558 + priority: 15613 } } element { @@ -60621,7 +61203,7 @@ cont { symbol { name: "basketball-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -60629,7 +61211,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15558 + priority: 15613 } } } @@ -60639,7 +61221,7 @@ cont { scale: 17 symbol { name: "bowls-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60648,14 +61230,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "bowls-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -60664,14 +61246,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15549 + priority: 15603 } } element { scale: 19 symbol { name: "bowls-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -60680,7 +61262,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15549 + priority: 15603 } } } @@ -60690,7 +61272,7 @@ cont { scale: 17 symbol { name: "cricket-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60699,14 +61281,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "cricket-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -60715,14 +61297,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15549 + priority: 15603 } } element { scale: 19 symbol { name: "cricket-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -60731,7 +61313,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15549 + priority: 15603 } } } @@ -60741,7 +61323,7 @@ cont { scale: 17 symbol { name: "curling-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60750,14 +61332,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "curling-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -60766,14 +61348,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15549 + priority: 15603 } } element { scale: 19 symbol { name: "curling-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -60782,7 +61364,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15549 + priority: 15603 } } } @@ -60792,7 +61374,7 @@ cont { scale: 17 symbol { name: "diving-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60801,14 +61383,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "diving-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -60817,14 +61399,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15549 + priority: 15603 } } element { scale: 19 symbol { name: "diving-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -60833,7 +61415,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15549 + priority: 15603 } } } @@ -60843,7 +61425,7 @@ cont { scale: 16 symbol { name: "equestrian-m" - priority: 16540 + priority: 16594 min_distance: 30 } } @@ -60851,7 +61433,7 @@ cont { scale: 17 symbol { name: "equestrian-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -60860,14 +61442,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "equestrian-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -60876,14 +61458,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "equestrian-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -60892,7 +61474,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -60902,7 +61484,7 @@ cont { scale: 17 symbol { name: "soccer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60911,14 +61493,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "soccer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60927,14 +61509,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "soccer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -60943,7 +61525,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -60957,7 +61539,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -60965,7 +61547,7 @@ cont { symbol { name: "golf-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -60973,7 +61555,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15558 + priority: 15613 } } element { @@ -60981,7 +61563,7 @@ cont { symbol { name: "golf-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -60989,7 +61571,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15558 + priority: 15613 } } } @@ -61003,7 +61585,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -61011,7 +61593,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -61019,7 +61601,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15558 + priority: 15613 } } element { @@ -61027,7 +61609,7 @@ cont { symbol { name: "pitch-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -61035,7 +61617,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15558 + priority: 15613 } } } @@ -61049,7 +61631,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -61060,7 +61642,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -61071,7 +61653,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -61081,12 +61663,12 @@ cont { scale: 17 area { color: 2171163 - priority: -15460 + priority: -15406 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61095,19 +61677,19 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 area { color: 2171163 - priority: -15460 + priority: -15406 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61116,19 +61698,19 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 area { color: 2171163 - priority: -15460 + priority: -15406 } symbol { name: "pitch-l" apply_for_type: 1 - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61137,7 +61719,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -61147,7 +61729,7 @@ cont { scale: 17 symbol { name: "diving-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61156,14 +61738,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "diving-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -61172,14 +61754,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15549 + priority: 15603 } } element { scale: 19 symbol { name: "diving-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -61188,7 +61770,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15549 + priority: 15603 } } } @@ -61198,7 +61780,7 @@ cont { scale: 17 symbol { name: "archery-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61207,14 +61789,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "archery-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -61223,14 +61805,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15549 + priority: 15603 } } element { scale: 19 symbol { name: "archery-l" - priority: 16549 + priority: 16603 min_distance: 10 } caption { @@ -61239,7 +61821,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15549 + priority: 15603 } } } @@ -61253,7 +61835,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -61264,7 +61846,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -61275,7 +61857,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -61285,18 +61867,18 @@ cont { scale: 16 area { color: 2171163 - priority: -15460 + priority: -15406 } } element { scale: 17 area { color: 2171163 - priority: -15460 + priority: -15406 } symbol { name: "soccer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61305,18 +61887,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 area { color: 2171163 - priority: -15460 + priority: -15406 } symbol { name: "soccer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61325,18 +61907,18 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 19 area { color: 2171163 - priority: -15460 + priority: -15406 } symbol { name: "soccer-l" - priority: 16540 + priority: 16594 min_distance: 10 } caption { @@ -61345,7 +61927,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } } @@ -61359,7 +61941,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { @@ -61367,7 +61949,7 @@ cont { symbol { name: "swimming-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -61375,7 +61957,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15558 + priority: 15613 } } element { @@ -61383,7 +61965,7 @@ cont { symbol { name: "swimming-l" apply_for_type: 1 - priority: 16558 + priority: 16613 } caption { primary { @@ -61391,7 +61973,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15558 + priority: 15613 } } } @@ -61402,7 +61984,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -61411,7 +61993,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { @@ -61419,7 +62001,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -61428,7 +62010,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { @@ -61436,7 +62018,7 @@ cont { symbol { name: "tennis-l" apply_for_type: 1 - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -61445,41 +62027,17 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } } cont { name: "tourism-alpine_hut" - element { - scale: 14 - caption { - primary { - height: 10 - color: 5592405 - stroke_color: 856756497 - offset_y: 10 - } - priority: 15684 - } - } - element { - scale: 15 - caption { - primary { - height: 10 - color: 5592405 - stroke_color: 856756497 - offset_y: 10 - } - priority: 15684 - } - } element { scale: 16 symbol { name: "alpine_hut-m" - priority: 16684 + priority: 16752 min_distance: 24 } caption { @@ -61489,14 +62047,14 @@ cont { stroke_color: 856756497 offset_y: 10 } - priority: 15684 + priority: 15752 } } element { scale: 17 symbol { name: "alpine_hut-l" - priority: 16684 + priority: 16752 min_distance: 16 } caption { @@ -61506,14 +62064,14 @@ cont { stroke_color: 856756497 offset_y: 10 } - priority: 15684 + priority: 15752 } } element { scale: 18 symbol { name: "alpine_hut-l" - priority: 16684 + priority: 16752 } caption { primary { @@ -61522,14 +62080,14 @@ cont { stroke_color: 856756497 offset_y: 12 } - priority: 15684 + priority: 15752 } } element { scale: 19 symbol { name: "alpine_hut-l" - priority: 16684 + priority: 16752 } caption { primary { @@ -61538,41 +62096,17 @@ cont { stroke_color: 856756497 offset_y: 12 } - priority: 15684 + priority: 15752 } } } cont { name: "tourism-apartment" - element { - scale: 14 - caption { - primary { - height: 10 - color: 5592405 - stroke_color: 856756497 - offset_y: 10 - } - priority: 15675 - } - } - element { - scale: 15 - caption { - primary { - height: 10 - color: 5592405 - stroke_color: 856756497 - offset_y: 10 - } - priority: 15675 - } - } element { scale: 16 symbol { name: "motel-m" - priority: 16675 + priority: 16742 min_distance: 24 } caption { @@ -61582,14 +62116,14 @@ cont { stroke_color: 856756497 offset_y: 10 } - priority: 15675 + priority: 15742 } } element { scale: 17 symbol { name: "motel-l" - priority: 16675 + priority: 16742 min_distance: 16 } caption { @@ -61599,14 +62133,14 @@ cont { stroke_color: 856756497 offset_y: 10 } - priority: 15675 + priority: 15742 } } element { scale: 18 symbol { name: "motel-l" - priority: 16675 + priority: 16742 } caption { primary { @@ -61615,14 +62149,14 @@ cont { stroke_color: 856756497 offset_y: 12 } - priority: 15675 + priority: 15742 } } element { scale: 19 symbol { name: "motel-l" - priority: 16675 + priority: 16742 } caption { primary { @@ -61631,7 +62165,7 @@ cont { stroke_color: 856756497 offset_y: 12 } - priority: 15675 + priority: 15742 } } } @@ -61642,7 +62176,7 @@ cont { symbol { name: "tourism-m" apply_for_type: 1 - priority: 16846 + priority: 16831 min_distance: 8 } caption { @@ -61651,7 +62185,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15846 + priority: 15831 } } element { @@ -61659,7 +62193,7 @@ cont { symbol { name: "tourism-m" apply_for_type: 1 - priority: 16846 + priority: 16831 min_distance: 28 } caption { @@ -61668,7 +62202,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15846 + priority: 15831 } } element { @@ -61676,7 +62210,7 @@ cont { symbol { name: "tourism-l" apply_for_type: 1 - priority: 16846 + priority: 16831 min_distance: 24 } caption { @@ -61685,7 +62219,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15846 + priority: 15831 } } element { @@ -61693,7 +62227,7 @@ cont { symbol { name: "tourism-l" apply_for_type: 1 - priority: 16846 + priority: 16831 min_distance: 24 } caption { @@ -61702,7 +62236,7 @@ cont { color: 5592405 offset_y: 12 } - priority: 15846 + priority: 15831 } } element { @@ -61710,7 +62244,7 @@ cont { symbol { name: "tourism-l" apply_for_type: 1 - priority: 16846 + priority: 16831 min_distance: 24 } caption { @@ -61719,7 +62253,7 @@ cont { color: 5592405 offset_y: 12 } - priority: 15846 + priority: 15831 } } } @@ -61729,7 +62263,7 @@ cont { scale: 14 symbol { name: "tourism-s" - priority: 16855 + priority: 16841 min_distance: 12 } caption { @@ -61738,7 +62272,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { @@ -61746,7 +62280,7 @@ cont { symbol { name: "tourism-m" apply_for_type: 1 - priority: 16855 + priority: 16841 min_distance: 36 } caption { @@ -61755,14 +62289,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 16 symbol { name: "tourism-m" - priority: 16855 + priority: 16841 min_distance: 36 } caption { @@ -61771,14 +62305,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 17 symbol { name: "tourism-l" - priority: 16855 + priority: 16841 min_distance: 24 } caption { @@ -61787,14 +62321,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15855 + priority: 15841 } } element { scale: 18 symbol { name: "tourism-l" - priority: 16855 + priority: 16841 min_distance: 24 } caption { @@ -61803,14 +62337,14 @@ cont { color: 5592405 offset_y: 12 } - priority: 15855 + priority: 15841 } } element { scale: 19 symbol { name: "tourism-l" - priority: 16855 + priority: 16841 min_distance: 24 } caption { @@ -61819,7 +62353,7 @@ cont { color: 5592405 offset_y: 12 } - priority: 15855 + priority: 15841 } } } @@ -61829,7 +62363,7 @@ cont { scale: 15 symbol { name: "campsite-m" - priority: 16567 + priority: 16623 min_distance: 12 } caption { @@ -61838,14 +62372,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 16 symbol { name: "campsite-m" - priority: 16567 + priority: 16623 min_distance: 12 } caption { @@ -61854,14 +62388,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 17 symbol { name: "campsite-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -61869,14 +62403,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 18 symbol { name: "campsite-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -61884,14 +62418,14 @@ cont { color: 5592405 offset_y: 12 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "campsite-l" - priority: 16567 + priority: 16623 } caption { primary { @@ -61899,7 +62433,7 @@ cont { color: 5592405 offset_y: 12 } - priority: 15567 + priority: 15623 } } } @@ -61909,7 +62443,7 @@ cont { scale: 16 symbol { name: "caravan_site-m" - priority: 16540 + priority: 16594 min_distance: 30 } caption { @@ -61918,14 +62452,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 17 symbol { name: "caravan_site-l" - priority: 16540 + priority: 16594 min_distance: 20 } caption { @@ -61934,14 +62468,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15540 + priority: 15594 } } element { scale: 18 symbol { name: "caravan_site-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -61949,14 +62483,14 @@ cont { color: 5592405 offset_y: 12 } - priority: 15540 + priority: 15594 } } element { scale: 19 symbol { name: "caravan_site-l" - priority: 16540 + priority: 16594 } caption { primary { @@ -61964,41 +62498,17 @@ cont { color: 5592405 offset_y: 12 } - priority: 15540 + priority: 15594 } } } cont { name: "tourism-chalet" - element { - scale: 14 - caption { - primary { - height: 10 - color: 5592405 - stroke_color: 856756497 - offset_y: 10 - } - priority: 15684 - } - } - element { - scale: 15 - caption { - primary { - height: 10 - color: 5592405 - stroke_color: 856756497 - offset_y: 10 - } - priority: 15684 - } - } element { scale: 16 symbol { name: "alpine_hut-m" - priority: 16684 + priority: 16752 min_distance: 24 } caption { @@ -62008,14 +62518,14 @@ cont { stroke_color: 856756497 offset_y: 10 } - priority: 15684 + priority: 15752 } } element { scale: 17 symbol { name: "alpine_hut-l" - priority: 16684 + priority: 16752 min_distance: 16 } caption { @@ -62025,14 +62535,14 @@ cont { stroke_color: 856756497 offset_y: 10 } - priority: 15684 + priority: 15752 } } element { scale: 18 symbol { name: "alpine_hut-l" - priority: 16684 + priority: 16752 } caption { primary { @@ -62041,14 +62551,14 @@ cont { stroke_color: 856756497 offset_y: 12 } - priority: 15684 + priority: 15752 } } element { scale: 19 symbol { name: "alpine_hut-l" - priority: 16684 + priority: 16752 } caption { primary { @@ -62057,7 +62567,7 @@ cont { stroke_color: 856756497 offset_y: 12 } - priority: 15684 + priority: 15752 } } } @@ -62068,7 +62578,7 @@ cont { symbol { name: "gallery-m" apply_for_type: 1 - priority: 16864 + priority: 16851 min_distance: 8 } caption { @@ -62077,14 +62587,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15864 + priority: 15851 } } element { scale: 16 symbol { name: "gallery-m" - priority: 16864 + priority: 16851 min_distance: 12 } caption { @@ -62093,14 +62603,14 @@ cont { color: 5592405 offset_y: 12 } - priority: 15864 + priority: 15851 } } element { scale: 17 symbol { name: "gallery-l" - priority: 16864 + priority: 16851 } caption { primary { @@ -62108,14 +62618,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15864 + priority: 15851 } } element { scale: 18 symbol { name: "gallery-l" - priority: 16864 + priority: 16851 } caption { primary { @@ -62123,14 +62633,14 @@ cont { color: 5592405 offset_y: 12 } - priority: 15864 + priority: 15851 } } element { scale: 19 symbol { name: "gallery-l" - priority: 16864 + priority: 16851 } caption { primary { @@ -62138,41 +62648,17 @@ cont { color: 5592405 offset_y: 12 } - priority: 15864 + priority: 15851 } } } cont { name: "tourism-guest_house" - element { - scale: 14 - caption { - primary { - height: 10 - color: 5592405 - stroke_color: 856756497 - offset_y: 10 - } - priority: 15675 - } - } - element { - scale: 15 - caption { - primary { - height: 10 - color: 5592405 - stroke_color: 856756497 - offset_y: 10 - } - priority: 15675 - } - } element { scale: 16 symbol { name: "motel-m" - priority: 16675 + priority: 16742 min_distance: 24 } caption { @@ -62182,14 +62668,14 @@ cont { stroke_color: 856756497 offset_y: 10 } - priority: 15675 + priority: 15742 } } element { scale: 17 symbol { name: "motel-l" - priority: 16675 + priority: 16742 min_distance: 16 } caption { @@ -62199,14 +62685,14 @@ cont { stroke_color: 856756497 offset_y: 10 } - priority: 15675 + priority: 15742 } } element { scale: 18 symbol { name: "motel-l" - priority: 16675 + priority: 16742 } caption { primary { @@ -62215,14 +62701,14 @@ cont { stroke_color: 856756497 offset_y: 12 } - priority: 15675 + priority: 15742 } } element { scale: 19 symbol { name: "motel-l" - priority: 16675 + priority: 16742 } caption { primary { @@ -62231,42 +62717,18 @@ cont { stroke_color: 856756497 offset_y: 12 } - priority: 15675 + priority: 15742 } } } cont { name: "tourism-hostel" - element { - scale: 14 - caption { - primary { - height: 10 - color: 5592405 - stroke_color: 856756497 - offset_y: 10 - } - priority: 15666 - } - } - element { - scale: 15 - caption { - primary { - height: 10 - color: 5592405 - stroke_color: 856756497 - offset_y: 10 - } - priority: 15666 - } - } element { scale: 16 symbol { name: "hotel-m" apply_for_type: 1 - priority: 16666 + priority: 16732 min_distance: 24 } caption { @@ -62276,7 +62738,7 @@ cont { stroke_color: 856756497 offset_y: 10 } - priority: 15666 + priority: 15732 } } element { @@ -62284,7 +62746,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16666 + priority: 16732 min_distance: 16 } caption { @@ -62294,7 +62756,7 @@ cont { stroke_color: 856756497 offset_y: 10 } - priority: 15666 + priority: 15732 } } element { @@ -62302,7 +62764,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16666 + priority: 16732 } caption { primary { @@ -62311,7 +62773,7 @@ cont { stroke_color: 856756497 offset_y: 12 } - priority: 15666 + priority: 15732 } } element { @@ -62319,7 +62781,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16666 + priority: 16732 } caption { primary { @@ -62328,42 +62790,18 @@ cont { stroke_color: 856756497 offset_y: 12 } - priority: 15666 + priority: 15732 } } } cont { name: "tourism-hotel" - element { - scale: 14 - caption { - primary { - height: 10 - color: 5592405 - stroke_color: 856756497 - offset_y: 10 - } - priority: 15693 - } - } - element { - scale: 15 - caption { - primary { - height: 10 - color: 5592405 - stroke_color: 856756497 - offset_y: 10 - } - priority: 15693 - } - } element { scale: 16 symbol { name: "hotel-m" apply_for_type: 1 - priority: 16693 + priority: 16762 min_distance: 24 } caption { @@ -62373,7 +62811,7 @@ cont { stroke_color: 856756497 offset_y: 10 } - priority: 15693 + priority: 15762 } } element { @@ -62381,7 +62819,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16693 + priority: 16762 min_distance: 16 } caption { @@ -62391,7 +62829,7 @@ cont { stroke_color: 856756497 offset_y: 10 } - priority: 15693 + priority: 15762 } } element { @@ -62399,7 +62837,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16693 + priority: 16762 } caption { primary { @@ -62408,7 +62846,7 @@ cont { stroke_color: 856756497 offset_y: 12 } - priority: 15693 + priority: 15762 } } element { @@ -62416,7 +62854,7 @@ cont { symbol { name: "hotel-l" apply_for_type: 1 - priority: 16693 + priority: 16762 } caption { primary { @@ -62425,7 +62863,7 @@ cont { stroke_color: 856756497 offset_y: 12 } - priority: 15693 + priority: 15762 } } } @@ -62436,7 +62874,7 @@ cont { symbol { name: "information-m" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 10 } caption { @@ -62445,7 +62883,7 @@ cont { color: 5592405 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -62453,7 +62891,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16531 + priority: 16584 } caption { primary { @@ -62461,7 +62899,7 @@ cont { color: 5592405 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -62469,7 +62907,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -62477,7 +62915,7 @@ cont { color: 5592405 offset_y: 12 } - priority: 15540 + priority: 15594 } } element { @@ -62485,7 +62923,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -62493,7 +62931,7 @@ cont { color: 5592405 offset_y: 12 } - priority: 15540 + priority: 15594 } } } @@ -62504,7 +62942,7 @@ cont { symbol { name: "information-m" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 10 } caption { @@ -62513,7 +62951,7 @@ cont { color: 5592405 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -62521,7 +62959,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16531 + priority: 16584 } caption { primary { @@ -62529,7 +62967,7 @@ cont { color: 5592405 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -62537,7 +62975,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -62545,7 +62983,7 @@ cont { color: 5592405 offset_y: 12 } - priority: 15540 + priority: 15594 } } element { @@ -62553,7 +62991,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -62561,7 +62999,7 @@ cont { color: 5592405 offset_y: 12 } - priority: 15540 + priority: 15594 } } } @@ -62572,7 +63010,7 @@ cont { symbol { name: "information-m" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 10 } caption { @@ -62581,7 +63019,7 @@ cont { color: 5592405 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -62589,7 +63027,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16531 + priority: 16584 } caption { primary { @@ -62597,7 +63035,7 @@ cont { color: 5592405 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -62605,7 +63043,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -62613,7 +63051,7 @@ cont { color: 5592405 offset_y: 12 } - priority: 15540 + priority: 15594 } } element { @@ -62621,7 +63059,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -62629,7 +63067,7 @@ cont { color: 5592405 offset_y: 12 } - priority: 15540 + priority: 15594 } } } @@ -62640,7 +63078,7 @@ cont { symbol { name: "information-m" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 10 } caption { @@ -62649,7 +63087,7 @@ cont { color: 5592405 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -62657,7 +63095,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16531 + priority: 16584 } caption { primary { @@ -62665,7 +63103,7 @@ cont { color: 5592405 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -62673,7 +63111,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -62681,7 +63119,7 @@ cont { color: 5592405 offset_y: 12 } - priority: 15540 + priority: 15594 } } element { @@ -62689,7 +63127,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -62697,7 +63135,7 @@ cont { color: 5592405 offset_y: 12 } - priority: 15540 + priority: 15594 } } } @@ -62708,7 +63146,7 @@ cont { symbol { name: "information-m" apply_for_type: 1 - priority: 16531 + priority: 16584 min_distance: 10 } caption { @@ -62717,7 +63155,7 @@ cont { color: 5592405 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -62725,7 +63163,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16531 + priority: 16584 } caption { primary { @@ -62733,7 +63171,7 @@ cont { color: 5592405 offset_y: 6 } - priority: 15531 + priority: 15584 } } element { @@ -62741,7 +63179,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -62749,7 +63187,7 @@ cont { color: 5592405 offset_y: 12 } - priority: 15540 + priority: 15594 } } element { @@ -62757,7 +63195,7 @@ cont { symbol { name: "information-l" apply_for_type: 1 - priority: 16540 + priority: 16594 } caption { primary { @@ -62765,41 +63203,17 @@ cont { color: 5592405 offset_y: 12 } - priority: 15540 + priority: 15594 } } } cont { name: "tourism-motel" - element { - scale: 14 - caption { - primary { - height: 10 - color: 5592405 - stroke_color: 856756497 - offset_y: 10 - } - priority: 15666 - } - } - element { - scale: 15 - caption { - primary { - height: 10 - color: 5592405 - stroke_color: 856756497 - offset_y: 10 - } - priority: 15666 - } - } element { scale: 16 symbol { name: "motel-m" - priority: 16666 + priority: 16732 min_distance: 24 } caption { @@ -62809,14 +63223,14 @@ cont { stroke_color: 856756497 offset_y: 10 } - priority: 15666 + priority: 15732 } } element { scale: 17 symbol { name: "motel-l" - priority: 16666 + priority: 16732 min_distance: 16 } caption { @@ -62826,14 +63240,14 @@ cont { stroke_color: 856756497 offset_y: 10 } - priority: 15666 + priority: 15732 } } element { scale: 18 symbol { name: "motel-l" - priority: 16666 + priority: 16732 } caption { primary { @@ -62842,14 +63256,14 @@ cont { stroke_color: 856756497 offset_y: 12 } - priority: 15666 + priority: 15732 } } element { scale: 19 symbol { name: "motel-l" - priority: 16666 + priority: 16732 } caption { primary { @@ -62858,7 +63272,7 @@ cont { stroke_color: 856756497 offset_y: 12 } - priority: 15666 + priority: 15732 } } } @@ -62868,7 +63282,7 @@ cont { scale: 13 symbol { name: "museum-s" - priority: 16873 + priority: 16861 min_distance: 16 } caption { @@ -62877,14 +63291,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15873 + priority: 15861 } } element { scale: 14 symbol { name: "museum-s" - priority: 16873 + priority: 16861 min_distance: 16 } caption { @@ -62893,14 +63307,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15873 + priority: 15861 } } element { scale: 15 symbol { name: "museum-m" - priority: 16873 + priority: 16861 min_distance: 24 } caption { @@ -62909,14 +63323,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15873 + priority: 15861 } } element { scale: 16 symbol { name: "museum-m" - priority: 16873 + priority: 16861 min_distance: 12 } caption { @@ -62925,14 +63339,14 @@ cont { color: 5592405 offset_y: 12 } - priority: 15873 + priority: 15861 } } element { scale: 17 symbol { name: "museum-l" - priority: 16873 + priority: 16861 } caption { primary { @@ -62940,14 +63354,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15873 + priority: 15861 } } element { scale: 18 symbol { name: "museum-l" - priority: 16873 + priority: 16861 } caption { primary { @@ -62955,14 +63369,14 @@ cont { color: 5592405 offset_y: 12 } - priority: 15873 + priority: 15861 } } element { scale: 19 symbol { name: "museum-l" - priority: 16873 + priority: 16861 } caption { primary { @@ -62970,7 +63384,7 @@ cont { color: 5592405 offset_y: 12 } - priority: 15873 + priority: 15861 } } } @@ -62980,7 +63394,7 @@ cont { scale: 16 symbol { name: "picnic-m" - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -62989,14 +63403,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 17 symbol { name: "picnic-l" - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -63005,14 +63419,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15567 + priority: 15623 } } element { scale: 18 symbol { name: "picnic-l" - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -63021,14 +63435,14 @@ cont { color: 5592405 offset_y: 12 } - priority: 15567 + priority: 15623 } } element { scale: 19 symbol { name: "picnic-l" - priority: 16567 + priority: 16623 min_distance: 10 } caption { @@ -63037,41 +63451,17 @@ cont { color: 5592405 offset_y: 12 } - priority: 15567 + priority: 15623 } } } cont { name: "tourism-resort" - element { - scale: 14 - caption { - primary { - height: 10 - color: 5592405 - stroke_color: 856756497 - offset_y: 10 - } - priority: 15684 - } - } - element { - scale: 15 - caption { - primary { - height: 10 - color: 5592405 - stroke_color: 856756497 - offset_y: 10 - } - priority: 15684 - } - } element { scale: 16 symbol { name: "alpine_hut-m" - priority: 16684 + priority: 16752 min_distance: 24 } caption { @@ -63081,14 +63471,14 @@ cont { stroke_color: 856756497 offset_y: 10 } - priority: 15684 + priority: 15752 } } element { scale: 17 symbol { name: "alpine_hut-l" - priority: 16684 + priority: 16752 min_distance: 16 } caption { @@ -63098,14 +63488,14 @@ cont { stroke_color: 856756497 offset_y: 10 } - priority: 15684 + priority: 15752 } } element { scale: 18 symbol { name: "alpine_hut-l" - priority: 16684 + priority: 16752 } caption { primary { @@ -63114,14 +63504,14 @@ cont { stroke_color: 856756497 offset_y: 12 } - priority: 15684 + priority: 15752 } } element { scale: 19 symbol { name: "alpine_hut-l" - priority: 16684 + priority: 16752 } caption { primary { @@ -63130,7 +63520,7 @@ cont { stroke_color: 856756497 offset_y: 12 } - priority: 15684 + priority: 15752 } } } @@ -63141,7 +63531,7 @@ cont { symbol { name: "viewpoint-s" apply_for_type: 1 - priority: 16891 + priority: 16881 min_distance: 8 } caption { @@ -63150,7 +63540,7 @@ cont { color: 5592405 offset_y: 6 } - priority: 15891 + priority: 15881 } } element { @@ -63158,7 +63548,7 @@ cont { symbol { name: "viewpoint-m" apply_for_type: 1 - priority: 16891 + priority: 16881 min_distance: 8 } caption { @@ -63167,7 +63557,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15891 + priority: 15881 } } element { @@ -63175,7 +63565,7 @@ cont { symbol { name: "viewpoint-m" apply_for_type: 1 - priority: 16891 + priority: 16881 min_distance: 8 } caption { @@ -63184,7 +63574,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15891 + priority: 15881 } } element { @@ -63192,7 +63582,7 @@ cont { symbol { name: "viewpoint-l" apply_for_type: 1 - priority: 16891 + priority: 16881 } caption { primary { @@ -63200,7 +63590,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15891 + priority: 15881 } } element { @@ -63208,7 +63598,7 @@ cont { symbol { name: "viewpoint-l" apply_for_type: 1 - priority: 16891 + priority: 16881 } caption { primary { @@ -63216,7 +63606,7 @@ cont { color: 5592405 offset_y: 12 } - priority: 15891 + priority: 15881 } } element { @@ -63224,7 +63614,7 @@ cont { symbol { name: "viewpoint-l" apply_for_type: 1 - priority: 16891 + priority: 16881 } caption { primary { @@ -63232,7 +63622,7 @@ cont { color: 5592405 offset_y: 12 } - priority: 15891 + priority: 15881 } } } @@ -63242,7 +63632,7 @@ cont { scale: 13 symbol { name: "zoo-s" - priority: 16900 + priority: 16891 min_distance: 12 } caption { @@ -63251,14 +63641,14 @@ cont { color: 5592405 offset_y: 6 } - priority: 15900 + priority: 15891 } } element { scale: 14 symbol { name: "zoo-s" - priority: 16900 + priority: 16891 min_distance: 12 } caption { @@ -63267,14 +63657,14 @@ cont { color: 5592405 offset_y: 6 } - priority: 15900 + priority: 15891 } } element { scale: 15 symbol { name: "zoo-m" - priority: 16900 + priority: 16891 min_distance: 8 } caption { @@ -63283,14 +63673,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15900 + priority: 15891 } } element { scale: 16 symbol { name: "zoo-m" - priority: 16900 + priority: 16891 min_distance: 8 } caption { @@ -63299,14 +63689,14 @@ cont { color: 5592405 offset_y: 12 } - priority: 15900 + priority: 15891 } } element { scale: 17 symbol { name: "zoo-l" - priority: 16900 + priority: 16891 } caption { primary { @@ -63314,14 +63704,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15900 + priority: 15891 } } element { scale: 18 symbol { name: "zoo-l" - priority: 16900 + priority: 16891 } caption { primary { @@ -63329,14 +63719,14 @@ cont { color: 5592405 offset_y: 12 } - priority: 15900 + priority: 15891 } } element { scale: 19 symbol { name: "zoo-l" - priority: 16900 + priority: 16891 } caption { primary { @@ -63344,7 +63734,7 @@ cont { color: 5592405 offset_y: 12 } - priority: 15900 + priority: 15891 } } } @@ -63364,7 +63754,7 @@ cont { height: 10 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -63381,7 +63771,7 @@ cont { height: 10 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -63398,7 +63788,7 @@ cont { height: 11 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -63415,7 +63805,7 @@ cont { height: 11 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -63432,7 +63822,7 @@ cont { height: 11 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -63449,7 +63839,7 @@ cont { height: 12 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -63466,7 +63856,7 @@ cont { height: 12 color: 19033 } - priority: 16972 + priority: 16970 } } } @@ -63477,7 +63867,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: BUTTCAP } @@ -63486,7 +63876,7 @@ cont { height: 10 color: 5592405 } - priority: 16972 + priority: 16970 } } element { @@ -63494,7 +63884,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -63503,7 +63893,7 @@ cont { height: 10 color: 5592405 } - priority: 16972 + priority: 16970 } } element { @@ -63511,7 +63901,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -63520,7 +63910,7 @@ cont { height: 10 color: 5592405 } - priority: 16972 + priority: 16970 } } element { @@ -63528,7 +63918,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -63537,7 +63927,7 @@ cont { height: 10 color: 5592405 } - priority: 16972 + priority: 16970 } } element { @@ -63545,7 +63935,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -63554,7 +63944,7 @@ cont { height: 10 color: 5592405 } - priority: 16972 + priority: 16970 } } } @@ -63569,7 +63959,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -63583,7 +63973,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -63597,7 +63987,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -63609,140 +63999,140 @@ cont { scale: 0 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 1 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 2 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 3 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 4 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 5 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 6 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 7 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 8 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 9 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 10 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 11 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 12 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 13 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 14 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 15 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 16 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 17 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 18 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 19 area { color: 8738 - priority: -15028 + priority: -15030 } } } @@ -63757,7 +64147,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -63771,7 +64161,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -63785,7 +64175,7 @@ cont { dd: 1.0 dd: 1.0 } - priority: 1972 + priority: 1970 join: ROUNDJOIN cap: ROUNDCAP } @@ -63841,7 +64231,7 @@ cont { symbol { name: "dot-m" apply_for_type: 1 - priority: 16153 + priority: 16168 } } element { @@ -63849,7 +64239,7 @@ cont { symbol { name: "dot-m" apply_for_type: 1 - priority: 16153 + priority: 16168 } } element { @@ -63857,7 +64247,7 @@ cont { symbol { name: "dot-m" apply_for_type: 1 - priority: 16153 + priority: 16168 } } element { @@ -63865,7 +64255,7 @@ cont { symbol { name: "dot-m" apply_for_type: 1 - priority: 16153 + priority: 16168 } } } @@ -63895,7 +64285,7 @@ cont { height: 10 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -63912,7 +64302,7 @@ cont { height: 10 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -63929,7 +64319,7 @@ cont { height: 10 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -63946,7 +64336,7 @@ cont { height: 10 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -63963,7 +64353,7 @@ cont { height: 12 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -63980,7 +64370,7 @@ cont { height: 12 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -63997,7 +64387,7 @@ cont { height: 12 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -64014,7 +64404,7 @@ cont { height: 12 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -64031,7 +64421,7 @@ cont { height: 12 color: 19033 } - priority: 16972 + priority: 16970 } } } @@ -64041,70 +64431,70 @@ cont { scale: 0 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 1 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 2 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 3 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 4 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 5 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 6 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 7 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 8 area { color: 8738 - priority: -15028 + priority: -15030 } } element { scale: 9 area { color: 8738 - priority: -15028 + priority: -15030 } } element { @@ -64118,7 +64508,7 @@ cont { } area { color: 8738 - priority: -15028 + priority: -15030 } } element { @@ -64132,14 +64522,14 @@ cont { } area { color: 8738 - priority: -15028 + priority: -15030 } path_text { primary { height: 10 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -64153,14 +64543,14 @@ cont { } area { color: 8738 - priority: -15028 + priority: -15030 } path_text { primary { height: 10 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -64174,14 +64564,14 @@ cont { } area { color: 8738 - priority: -15028 + priority: -15030 } path_text { primary { height: 10 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -64195,14 +64585,14 @@ cont { } area { color: 8738 - priority: -15028 + priority: -15030 } path_text { primary { height: 10 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -64216,14 +64606,14 @@ cont { } area { color: 8738 - priority: -15028 + priority: -15030 } path_text { primary { height: 12 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -64237,14 +64627,14 @@ cont { } area { color: 8738 - priority: -15028 + priority: -15030 } path_text { primary { height: 12 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -64258,14 +64648,14 @@ cont { } area { color: 8738 - priority: -15028 + priority: -15030 } path_text { primary { height: 12 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -64279,14 +64669,14 @@ cont { } area { color: 8738 - priority: -15028 + priority: -15030 } path_text { primary { height: 12 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -64300,14 +64690,14 @@ cont { } area { color: 8738 - priority: -15028 + priority: -15030 } path_text { primary { height: 12 color: 19033 } - priority: 16972 + priority: 16970 } } } @@ -64327,7 +64717,7 @@ cont { height: 10 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -64344,7 +64734,7 @@ cont { height: 10 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -64361,7 +64751,7 @@ cont { height: 11 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -64378,7 +64768,7 @@ cont { height: 11 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -64395,7 +64785,7 @@ cont { height: 11 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -64412,7 +64802,7 @@ cont { height: 12 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -64429,7 +64819,7 @@ cont { height: 12 color: 19033 } - priority: 16972 + priority: 16970 } } } @@ -64449,7 +64839,7 @@ cont { height: 10 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -64466,7 +64856,7 @@ cont { height: 10 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -64483,7 +64873,7 @@ cont { height: 11 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -64500,7 +64890,7 @@ cont { height: 11 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -64517,7 +64907,7 @@ cont { height: 11 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -64534,7 +64924,7 @@ cont { height: 12 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -64551,7 +64941,7 @@ cont { height: 12 color: 19033 } - priority: 16972 + priority: 16970 } } } @@ -64575,7 +64965,7 @@ cont { height: 10 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -64596,7 +64986,7 @@ cont { height: 10 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -64617,7 +65007,7 @@ cont { height: 11 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -64638,7 +65028,7 @@ cont { height: 11 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -64659,7 +65049,7 @@ cont { height: 11 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -64680,7 +65070,7 @@ cont { height: 12 color: 19033 } - priority: 16972 + priority: 16970 } } element { @@ -64701,7 +65091,7 @@ cont { height: 12 color: 19033 } - priority: 16972 + priority: 16970 } } } @@ -64711,7 +65101,7 @@ cont { scale: 11 symbol { name: "waterfall-s" - priority: 16531 + priority: 16584 min_distance: 15 } caption { @@ -64720,14 +65110,14 @@ cont { color: 5592405 offset_y: 5 } - priority: 15531 + priority: 15584 } } element { scale: 12 symbol { name: "waterfall-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -64735,14 +65125,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 13 symbol { name: "waterfall-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -64750,14 +65140,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 14 symbol { name: "waterfall-s" - priority: 16531 + priority: 16584 } caption { primary { @@ -64765,14 +65155,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 15 symbol { name: "waterfall-m" - priority: 16531 + priority: 16584 } caption { primary { @@ -64780,14 +65170,14 @@ cont { color: 5592405 offset_y: 8 } - priority: 15531 + priority: 15584 } } element { scale: 16 symbol { name: "waterfall-m" - priority: 16531 + priority: 16584 } caption { primary { @@ -64795,14 +65185,14 @@ cont { color: 5592405 offset_y: 8 } - priority: 15531 + priority: 15584 } } element { scale: 17 symbol { name: "waterfall-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -64810,14 +65200,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 18 symbol { name: "waterfall-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -64825,14 +65215,14 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } element { scale: 19 symbol { name: "waterfall-l" - priority: 16531 + priority: 16584 } caption { primary { @@ -64840,7 +65230,7 @@ cont { color: 5592405 offset_y: 10 } - priority: 15531 + priority: 15584 } } } @@ -64851,7 +65241,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: BUTTCAP } @@ -64860,7 +65250,7 @@ cont { height: 10 color: 5592405 } - priority: 16423 + priority: 16465 } } element { @@ -64868,7 +65258,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -64877,7 +65267,7 @@ cont { height: 10 color: 5592405 } - priority: 16423 + priority: 16465 } } element { @@ -64885,7 +65275,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -64894,7 +65284,7 @@ cont { height: 10 color: 5592405 } - priority: 16423 + priority: 16465 } } element { @@ -64902,7 +65292,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -64911,7 +65301,7 @@ cont { height: 10 color: 5592405 } - priority: 16423 + priority: 16465 } } element { @@ -64919,7 +65309,7 @@ cont { lines { width: 1.0 color: 4473924 - priority: 1423 + priority: 1465 join: ROUNDJOIN cap: ROUNDCAP } @@ -64928,7 +65318,7 @@ cont { height: 10 color: 5592405 } - priority: 16423 + priority: 16465 } } } diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index 5816c600b8..3a5ae96282 100644 Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt index 38da9e576e..7f17bb9710 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -177,13 +177,13 @@ cont { } caption { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 1308622847 offset_y: 7 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 1308622847 offset_y: 20 @@ -204,13 +204,13 @@ cont { } caption { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 1308622847 offset_y: 7 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 1308622847 offset_y: 20 @@ -231,13 +231,13 @@ cont { } caption { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 1308622847 offset_y: 7 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 1308622847 offset_y: 20 @@ -436,13 +436,13 @@ cont { } caption { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 1308622847 offset_y: 7 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 1308622847 offset_y: 20 @@ -463,13 +463,13 @@ cont { } caption { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 1308622847 offset_y: 7 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 1308622847 offset_y: 20 @@ -490,13 +490,13 @@ cont { } caption { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 1308622847 offset_y: 7 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 1308622847 offset_y: 20 @@ -621,7 +621,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4473924 offset_y: 10 } @@ -637,7 +637,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -653,7 +653,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -704,7 +704,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4473924 offset_y: 10 } @@ -720,7 +720,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -736,7 +736,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -754,7 +754,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -769,7 +769,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -787,7 +787,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -802,7 +802,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -821,7 +821,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4473924 offset_y: 8 } @@ -837,7 +837,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -853,7 +853,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -919,7 +919,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4473924 offset_y: 8 } @@ -934,7 +934,7 @@ cont { } caption { primary { - height: 12 + height: 14 color: 4473924 offset_y: 8 } @@ -949,7 +949,7 @@ cont { } caption { primary { - height: 12 + height: 14 color: 4473924 offset_y: 8 } @@ -968,7 +968,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4473924 offset_y: 10 } @@ -984,7 +984,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -1000,7 +1000,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -1098,7 +1098,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4473924 offset_y: 8 } @@ -1113,7 +1113,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 8 } @@ -1128,7 +1128,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 8 } @@ -1272,7 +1272,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4473924 offset_y: 10 } @@ -1288,7 +1288,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -1304,7 +1304,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -2376,7 +2376,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4473924 offset_y: 10 } @@ -2392,7 +2392,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -2408,7 +2408,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -2435,7 +2435,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4473924 offset_y: 10 } @@ -2451,7 +2451,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -2467,7 +2467,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -2494,7 +2494,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4473924 offset_y: 10 } @@ -2510,7 +2510,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -2526,7 +2526,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -2553,7 +2553,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4473924 offset_y: 10 } @@ -2569,7 +2569,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -2585,7 +2585,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -2612,7 +2612,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4473924 offset_y: 10 } @@ -2628,7 +2628,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -2644,7 +2644,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -2671,7 +2671,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4473924 offset_y: 10 } @@ -2687,7 +2687,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -2703,7 +2703,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -2730,7 +2730,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4473924 offset_y: 10 } @@ -2746,7 +2746,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -2762,7 +2762,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -2789,7 +2789,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4473924 offset_y: 10 } @@ -2805,7 +2805,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -2821,7 +2821,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -2856,7 +2856,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4473924 offset_y: 10 } @@ -2872,7 +2872,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -2888,7 +2888,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -2965,7 +2965,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4473924 offset_y: 10 } @@ -2994,7 +2994,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -3022,7 +3022,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 10 } @@ -3156,7 +3156,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4473924 offset_y: 10 } @@ -3172,7 +3172,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4473924 offset_y: 10 } @@ -3188,7 +3188,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4473924 offset_y: 10 } @@ -3579,7 +3579,7 @@ cont { element { scale: 12 symbol { - name: "toll_booth-s" + name: "toll_booth-m" priority: 16868 min_distance: 8 } @@ -3587,7 +3587,7 @@ cont { element { scale: 13 symbol { - name: "toll_booth-s" + name: "toll_booth-m" priority: 16868 min_distance: 8 } @@ -3595,7 +3595,7 @@ cont { element { scale: 14 symbol { - name: "toll_booth-s" + name: "toll_booth-m" priority: 16868 min_distance: 8 } @@ -4466,7 +4466,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 3832097 stroke_color: 452984831 offset_y: 10 @@ -4482,7 +4482,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 3832097 stroke_color: 452984831 offset_y: 10 @@ -4498,7 +4498,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 3832097 stroke_color: 452984831 offset_y: 10 @@ -4543,7 +4543,7 @@ cont { } caption { primary { - height: 13 + height: 15 color: 6381914 text: "addr:housenumber" } @@ -4562,7 +4562,7 @@ cont { } caption { primary { - height: 14 + height: 16 color: 6381914 text: "addr:housenumber" } @@ -4581,7 +4581,7 @@ cont { } caption { primary { - height: 14 + height: 17 color: 6381914 text: "addr:housenumber" } @@ -4611,11 +4611,11 @@ cont { scale: 17 caption { primary { - height: 13 + height: 15 color: 6381914 } secondary { - height: 12 + height: 14 color: 6381914 offset_y: 20 text: "int_name" @@ -4627,11 +4627,11 @@ cont { scale: 18 caption { primary { - height: 14 + height: 16 color: 6381914 } secondary { - height: 13 + height: 15 color: 6381914 offset_y: 20 text: "int_name" @@ -4643,11 +4643,11 @@ cont { scale: 19 caption { primary { - height: 14 + height: 17 color: 6381914 } secondary { - height: 14 + height: 17 color: 6381914 offset_y: 20 text: "int_name" @@ -4692,7 +4692,7 @@ cont { } caption { primary { - height: 13 + height: 15 color: 6381914 text: "addr:housenumber" } @@ -4711,7 +4711,7 @@ cont { } caption { primary { - height: 14 + height: 16 color: 6381914 text: "addr:housenumber" } @@ -4730,7 +4730,7 @@ cont { } caption { primary { - height: 14 + height: 17 color: 6381914 text: "addr:housenumber" } @@ -4774,7 +4774,7 @@ cont { } caption { primary { - height: 13 + height: 15 color: 6381914 text: "addr:housenumber" } @@ -4793,7 +4793,7 @@ cont { } caption { primary { - height: 14 + height: 16 color: 6381914 text: "addr:housenumber" } @@ -4812,7 +4812,7 @@ cont { } caption { primary { - height: 14 + height: 17 color: 6381914 text: "addr:housenumber" } @@ -4955,7 +4955,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 872415231 offset_y: 8 @@ -4987,7 +4987,7 @@ cont { } caption { primary { - height: 13 + height: 15 color: 6381914 stroke_color: 452984831 offset_y: 8 @@ -5020,7 +5020,7 @@ cont { } caption { primary { - height: 14 + height: 16 color: 6381914 stroke_color: 452984831 offset_y: 8 @@ -5053,7 +5053,7 @@ cont { } caption { primary { - height: 14 + height: 17 color: 6381914 stroke_color: 452984831 offset_y: 8 @@ -5251,7 +5251,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 871230427 } @@ -5269,7 +5269,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -5287,7 +5287,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 872415231 } @@ -5305,7 +5305,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 872415231 } @@ -5323,7 +5323,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -5341,7 +5341,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -5382,7 +5382,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 871230427 } @@ -5400,7 +5400,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -5418,7 +5418,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 872415231 } @@ -5436,7 +5436,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 872415231 } @@ -5454,7 +5454,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -5472,7 +5472,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -5513,7 +5513,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 871230427 } @@ -5531,7 +5531,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -5560,7 +5560,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 872415231 } @@ -5589,7 +5589,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 872415231 } @@ -5618,7 +5618,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -5647,7 +5647,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -5698,7 +5698,7 @@ cont { } path_text { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 452984831 } @@ -5724,7 +5724,7 @@ cont { } path_text { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 452984831 } @@ -5750,7 +5750,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -5776,7 +5776,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -5809,7 +5809,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 452984831 } @@ -5842,7 +5842,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 452984831 } @@ -5875,7 +5875,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 3355443 stroke_color: 452984831 } @@ -5908,7 +5908,7 @@ cont { } path_text { primary { - height: 17 + height: 19 color: 3355443 stroke_color: 67108863 } @@ -5941,7 +5941,7 @@ cont { } path_text { primary { - height: 18 + height: 20 color: 3355443 stroke_color: 16777215 } @@ -5974,7 +5974,7 @@ cont { } path_text { primary { - height: 18 + height: 20 color: 3355443 stroke_color: 16777215 } @@ -6033,7 +6033,7 @@ cont { } path_text { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 452984831 } @@ -6059,7 +6059,7 @@ cont { } path_text { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 452984831 } @@ -6085,7 +6085,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -6125,7 +6125,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -6172,7 +6172,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 452984831 } @@ -6219,7 +6219,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 452984831 } @@ -6266,7 +6266,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 3355443 stroke_color: 452984831 } @@ -6313,7 +6313,7 @@ cont { } path_text { primary { - height: 17 + height: 19 color: 3355443 stroke_color: 67108863 } @@ -6360,7 +6360,7 @@ cont { } path_text { primary { - height: 18 + height: 20 color: 3355443 stroke_color: 16777215 } @@ -6407,7 +6407,7 @@ cont { } path_text { primary { - height: 18 + height: 20 color: 3355443 stroke_color: 16777215 } @@ -6466,7 +6466,7 @@ cont { } path_text { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 452984831 } @@ -6492,7 +6492,7 @@ cont { } path_text { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 452984831 } @@ -6529,7 +6529,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -6566,7 +6566,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -6603,7 +6603,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 452984831 } @@ -6640,7 +6640,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 452984831 } @@ -6677,7 +6677,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 3355443 stroke_color: 452984831 } @@ -6714,7 +6714,7 @@ cont { } path_text { primary { - height: 17 + height: 19 color: 3355443 stroke_color: 67108863 } @@ -6751,7 +6751,7 @@ cont { } path_text { primary { - height: 18 + height: 20 color: 3355443 stroke_color: 16777215 } @@ -6788,7 +6788,7 @@ cont { } path_text { primary { - height: 18 + height: 20 color: 3355443 stroke_color: 16777215 } @@ -6863,7 +6863,7 @@ cont { scale: 10 path_text { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 452984831 } @@ -6874,7 +6874,7 @@ cont { scale: 11 path_text { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 452984831 } @@ -6885,7 +6885,7 @@ cont { scale: 12 path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -6903,7 +6903,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -6936,7 +6936,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 451800027 } @@ -6969,7 +6969,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 451800027 } @@ -7002,7 +7002,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -7035,7 +7035,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 67108863 } @@ -7068,7 +7068,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 16777215 } @@ -7101,7 +7101,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 16777215 } @@ -7123,7 +7123,7 @@ cont { scale: 10 path_text { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 452984831 } @@ -7134,7 +7134,7 @@ cont { scale: 11 path_text { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 452984831 } @@ -7145,7 +7145,7 @@ cont { scale: 12 path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -7163,7 +7163,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -7210,7 +7210,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 451800027 } @@ -7257,7 +7257,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 451800027 } @@ -7304,7 +7304,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -7351,7 +7351,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 67108863 } @@ -7398,7 +7398,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 16777215 } @@ -7445,7 +7445,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 16777215 } @@ -7467,7 +7467,7 @@ cont { scale: 10 path_text { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 452984831 } @@ -7478,7 +7478,7 @@ cont { scale: 11 path_text { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 452984831 } @@ -7489,7 +7489,7 @@ cont { scale: 12 path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -7518,7 +7518,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -7555,7 +7555,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 451800027 } @@ -7592,7 +7592,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 451800027 } @@ -7629,7 +7629,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -7666,7 +7666,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 67108863 } @@ -7703,7 +7703,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 16777215 } @@ -7740,7 +7740,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 16777215 } @@ -7762,7 +7762,7 @@ cont { scale: 14 path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 871230427 } @@ -7773,7 +7773,7 @@ cont { scale: 15 path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -7784,7 +7784,7 @@ cont { scale: 16 path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -7795,7 +7795,7 @@ cont { scale: 17 path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -7806,7 +7806,7 @@ cont { scale: 18 path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -7817,7 +7817,7 @@ cont { scale: 19 path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -7831,7 +7831,7 @@ cont { scale: 14 path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 871230427 } @@ -7842,7 +7842,7 @@ cont { scale: 15 path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -7853,7 +7853,7 @@ cont { scale: 16 path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -7864,7 +7864,7 @@ cont { scale: 17 path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -7875,7 +7875,7 @@ cont { scale: 18 path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -7886,7 +7886,7 @@ cont { scale: 19 path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -7900,7 +7900,7 @@ cont { scale: 14 path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 871230427 } @@ -7911,7 +7911,7 @@ cont { scale: 15 path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -7922,7 +7922,7 @@ cont { scale: 16 path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -7933,7 +7933,7 @@ cont { scale: 17 path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -7944,7 +7944,7 @@ cont { scale: 18 path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -7955,7 +7955,7 @@ cont { scale: 19 path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -7969,7 +7969,7 @@ cont { scale: 14 path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 871230427 } @@ -7980,7 +7980,7 @@ cont { scale: 15 path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -7991,7 +7991,7 @@ cont { scale: 16 path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -8002,7 +8002,7 @@ cont { scale: 17 path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -8013,7 +8013,7 @@ cont { scale: 18 path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -8024,7 +8024,7 @@ cont { scale: 19 path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -8065,7 +8065,7 @@ cont { } path_text { primary { - height: 11 + height: 12 color: 3355443 stroke_color: 871230427 } @@ -8091,7 +8091,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -8117,7 +8117,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 451800027 } @@ -8143,7 +8143,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 451800027 } @@ -8176,7 +8176,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -8209,7 +8209,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -8242,7 +8242,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 872415231 } @@ -8275,7 +8275,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 3355443 stroke_color: 872415231 } @@ -8308,7 +8308,7 @@ cont { } path_text { primary { - height: 17 + height: 19 color: 3355443 stroke_color: 872415231 } @@ -8341,7 +8341,7 @@ cont { } path_text { primary { - height: 17 + height: 19 color: 3355443 stroke_color: 872415231 } @@ -8390,7 +8390,7 @@ cont { } path_text { primary { - height: 11 + height: 12 color: 3355443 stroke_color: 871230427 } @@ -8416,7 +8416,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -8442,7 +8442,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 451800027 } @@ -8468,7 +8468,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 451800027 } @@ -8515,7 +8515,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -8562,7 +8562,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -8609,7 +8609,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 872415231 } @@ -8656,7 +8656,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 3355443 stroke_color: 872415231 } @@ -8703,7 +8703,7 @@ cont { } path_text { primary { - height: 17 + height: 19 color: 3355443 stroke_color: 872415231 } @@ -8750,7 +8750,7 @@ cont { } path_text { primary { - height: 17 + height: 19 color: 3355443 stroke_color: 872415231 } @@ -8799,7 +8799,7 @@ cont { } path_text { primary { - height: 11 + height: 12 color: 3355443 stroke_color: 871230427 } @@ -8825,7 +8825,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -8851,7 +8851,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 451800027 } @@ -8877,7 +8877,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 451800027 } @@ -8914,7 +8914,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -8951,7 +8951,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -8988,7 +8988,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 872415231 } @@ -9025,7 +9025,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 3355443 stroke_color: 872415231 } @@ -9062,7 +9062,7 @@ cont { } path_text { primary { - height: 17 + height: 19 color: 3355443 stroke_color: 872415231 } @@ -9099,7 +9099,7 @@ cont { } path_text { primary { - height: 17 + height: 19 color: 3355443 stroke_color: 872415231 } @@ -9121,7 +9121,7 @@ cont { scale: 10 path_text { primary { - height: 11 + height: 12 color: 3355443 stroke_color: 871230427 } @@ -9132,7 +9132,7 @@ cont { scale: 11 path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -9143,7 +9143,7 @@ cont { scale: 12 path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 451800027 } @@ -9154,7 +9154,7 @@ cont { scale: 13 path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 451800027 } @@ -9179,7 +9179,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -9212,7 +9212,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -9245,7 +9245,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -9278,7 +9278,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -9311,7 +9311,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 16777215 } @@ -9344,7 +9344,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 16777215 } @@ -9366,7 +9366,7 @@ cont { scale: 10 path_text { primary { - height: 11 + height: 12 color: 3355443 stroke_color: 871230427 } @@ -9377,7 +9377,7 @@ cont { scale: 11 path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -9388,7 +9388,7 @@ cont { scale: 12 path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 451800027 } @@ -9399,7 +9399,7 @@ cont { scale: 13 path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 451800027 } @@ -9438,7 +9438,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -9485,7 +9485,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -9532,7 +9532,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -9579,7 +9579,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -9626,7 +9626,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 16777215 } @@ -9673,7 +9673,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 16777215 } @@ -9695,7 +9695,7 @@ cont { scale: 10 path_text { primary { - height: 11 + height: 12 color: 3355443 stroke_color: 871230427 } @@ -9706,7 +9706,7 @@ cont { scale: 11 path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -9717,7 +9717,7 @@ cont { scale: 12 path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 451800027 } @@ -9728,7 +9728,7 @@ cont { scale: 13 path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 451800027 } @@ -9757,7 +9757,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -9794,7 +9794,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -9831,7 +9831,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -9868,7 +9868,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -9905,7 +9905,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 16777215 } @@ -9942,7 +9942,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 16777215 } @@ -10082,7 +10082,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 4473924 stroke_color: 452984831 } @@ -10108,7 +10108,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 4473924 stroke_color: 452984831 } @@ -10134,7 +10134,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -10167,7 +10167,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 871230427 } @@ -10200,7 +10200,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -10233,7 +10233,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 872415231 } @@ -10266,7 +10266,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 16777215 } @@ -10299,7 +10299,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 16777215 } @@ -10338,7 +10338,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 4473924 stroke_color: 452984831 } @@ -10364,7 +10364,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 4473924 stroke_color: 452984831 } @@ -10390,7 +10390,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -10423,7 +10423,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 871230427 } @@ -10456,7 +10456,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -10489,7 +10489,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 872415231 } @@ -10522,7 +10522,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 16777215 } @@ -10555,7 +10555,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 16777215 } @@ -10594,7 +10594,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 4473924 stroke_color: 452984831 } @@ -10620,7 +10620,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 4473924 stroke_color: 452984831 } @@ -10660,7 +10660,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -10707,7 +10707,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 871230427 } @@ -10754,7 +10754,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -10801,7 +10801,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 872415231 } @@ -10848,7 +10848,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 16777215 } @@ -10895,7 +10895,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 16777215 } @@ -10934,7 +10934,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 4473924 stroke_color: 452984831 } @@ -10960,7 +10960,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 4473924 stroke_color: 452984831 } @@ -10986,7 +10986,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -11019,7 +11019,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 871230427 } @@ -11056,7 +11056,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -11093,7 +11093,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 872415231 } @@ -11130,7 +11130,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 16777215 } @@ -11167,7 +11167,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 16777215 } @@ -11216,7 +11216,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 871230427 } @@ -11234,7 +11234,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -11252,7 +11252,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -11270,7 +11270,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -11288,7 +11288,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -11306,7 +11306,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -11347,7 +11347,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 871230427 } @@ -11365,7 +11365,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -11383,7 +11383,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -11401,7 +11401,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -11419,7 +11419,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -11437,7 +11437,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -11478,7 +11478,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 871230427 } @@ -11496,7 +11496,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -11514,7 +11514,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -11532,7 +11532,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -11550,7 +11550,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -11568,7 +11568,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -11589,7 +11589,7 @@ cont { } path_text { primary { - height: 11 + height: 12 color: 4473924 stroke_color: 871230427 } @@ -11607,7 +11607,7 @@ cont { } path_text { primary { - height: 11 + height: 12 color: 4473924 stroke_color: 871230427 } @@ -11625,7 +11625,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 4473924 stroke_color: 452984831 } @@ -11651,7 +11651,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 4473924 stroke_color: 452984831 } @@ -11684,7 +11684,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 871230427 } @@ -11717,7 +11717,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 871230427 } @@ -11750,7 +11750,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 872415231 } @@ -11783,7 +11783,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 872415231 } @@ -11816,7 +11816,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 3355443 stroke_color: 16777215 } @@ -11849,7 +11849,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 3355443 stroke_color: 16777215 } @@ -11878,7 +11878,7 @@ cont { } path_text { primary { - height: 11 + height: 12 color: 4473924 stroke_color: 871230427 } @@ -11896,7 +11896,7 @@ cont { } path_text { primary { - height: 11 + height: 12 color: 4473924 stroke_color: 871230427 } @@ -11914,7 +11914,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 4473924 stroke_color: 452984831 } @@ -11940,7 +11940,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 4473924 stroke_color: 452984831 } @@ -11987,7 +11987,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 871230427 } @@ -12034,7 +12034,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 871230427 } @@ -12081,7 +12081,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 872415231 } @@ -12128,7 +12128,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 872415231 } @@ -12175,7 +12175,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 3355443 stroke_color: 16777215 } @@ -12222,7 +12222,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 3355443 stroke_color: 16777215 } @@ -12251,7 +12251,7 @@ cont { } path_text { primary { - height: 11 + height: 12 color: 4473924 stroke_color: 871230427 } @@ -12269,7 +12269,7 @@ cont { } path_text { primary { - height: 11 + height: 12 color: 4473924 stroke_color: 871230427 } @@ -12287,7 +12287,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 4473924 stroke_color: 452984831 } @@ -12313,7 +12313,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 4473924 stroke_color: 452984831 } @@ -12346,7 +12346,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 871230427 } @@ -12379,7 +12379,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 871230427 } @@ -12416,7 +12416,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 872415231 } @@ -12453,7 +12453,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 872415231 } @@ -12490,7 +12490,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 3355443 stroke_color: 16777215 } @@ -12527,7 +12527,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 3355443 stroke_color: 16777215 } @@ -12597,7 +12597,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 872415231 } @@ -12622,7 +12622,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 872415231 } @@ -12647,7 +12647,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 3355443 stroke_color: 16777215 } @@ -12672,7 +12672,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 3355443 stroke_color: 16777215 } @@ -12776,7 +12776,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 872415231 } @@ -12815,7 +12815,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 872415231 } @@ -12854,7 +12854,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 3355443 stroke_color: 16777215 } @@ -12893,7 +12893,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 3355443 stroke_color: 16777215 } @@ -12959,7 +12959,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 872415231 } @@ -12988,7 +12988,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 872415231 } @@ -13017,7 +13017,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 3355443 stroke_color: 16777215 } @@ -13046,7 +13046,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 3355443 stroke_color: 16777215 } @@ -13087,7 +13087,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -13105,7 +13105,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -13123,7 +13123,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -13141,7 +13141,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -13182,7 +13182,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -13200,7 +13200,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -13218,7 +13218,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -13236,7 +13236,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -13277,7 +13277,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -13295,7 +13295,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -13313,7 +13313,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -13331,7 +13331,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -13362,7 +13362,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -13380,7 +13380,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -13398,7 +13398,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -13416,7 +13416,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -13447,7 +13447,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -13465,7 +13465,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -13483,7 +13483,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -13501,7 +13501,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -13532,7 +13532,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -13550,7 +13550,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -13568,7 +13568,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -13586,7 +13586,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -13617,7 +13617,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -13635,7 +13635,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -13653,7 +13653,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -13671,7 +13671,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -13712,7 +13712,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -13730,7 +13730,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -13748,7 +13748,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -13766,7 +13766,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -13807,7 +13807,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -13825,7 +13825,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -13843,7 +13843,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -13861,7 +13861,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -13951,7 +13951,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 4473924 stroke_color: 452984831 } @@ -13977,7 +13977,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 4473924 stroke_color: 452984831 } @@ -14003,7 +14003,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -14036,7 +14036,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 871230427 } @@ -14069,7 +14069,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -14102,7 +14102,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 872415231 } @@ -14135,7 +14135,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 16777215 } @@ -14168,7 +14168,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 16777215 } @@ -14207,7 +14207,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 4473924 stroke_color: 452984831 } @@ -14233,7 +14233,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 4473924 stroke_color: 452984831 } @@ -14273,7 +14273,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -14320,7 +14320,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 871230427 } @@ -14367,7 +14367,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -14414,7 +14414,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 872415231 } @@ -14461,7 +14461,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 16777215 } @@ -14508,7 +14508,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 16777215 } @@ -14547,7 +14547,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 4473924 stroke_color: 452984831 } @@ -14573,7 +14573,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 4473924 stroke_color: 452984831 } @@ -14599,7 +14599,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -14632,7 +14632,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 871230427 } @@ -14669,7 +14669,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 872415231 } @@ -14706,7 +14706,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 872415231 } @@ -14743,7 +14743,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 16777215 } @@ -14780,7 +14780,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 16777215 } @@ -14867,7 +14867,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 16777215 } @@ -14892,7 +14892,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 16777215 } @@ -15027,7 +15027,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 16777215 } @@ -15066,7 +15066,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 16777215 } @@ -15157,7 +15157,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 16777215 } @@ -15186,7 +15186,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 3355443 stroke_color: 16777215 } @@ -15194,6 +15194,93 @@ cont { } } } +cont { + name: "highway-track-grade1" + element { + scale: 14 + lines { + width: 1.4 + color: 16579836 + dashdot { + dd: 2.0 + dd: 1.35 + } + priority: 1381 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 16579836 + dashdot { + dd: 2.2 + dd: 1.26 + } + priority: 1381 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 2.6 + color: 16579836 + dashdot { + dd: 3.3 + dd: 1.8 + } + priority: 1381 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 17 + lines { + width: 3.0 + color: 16579836 + dashdot { + dd: 4.0 + dd: 1.8 + } + priority: 1381 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 16579836 + dashdot { + dd: 4.0 + dd: 1.8 + } + priority: 1381 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 19 + lines { + width: 4.0 + color: 16579836 + dashdot { + dd: 6.3 + dd: 2.7 + } + priority: 1381 + join: ROUNDJOIN + cap: ROUNDCAP + } + } +} cont { name: "highway-trunk" element { @@ -15237,7 +15324,7 @@ cont { } path_text { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 452984831 } @@ -15263,7 +15350,7 @@ cont { } path_text { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 452984831 } @@ -15289,7 +15376,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -15315,7 +15402,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -15348,7 +15435,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 452984831 } @@ -15381,7 +15468,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 452984831 } @@ -15414,7 +15501,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 3355443 stroke_color: 452984831 } @@ -15447,7 +15534,7 @@ cont { } path_text { primary { - height: 17 + height: 19 color: 3355443 stroke_color: 67108863 } @@ -15480,7 +15567,7 @@ cont { } path_text { primary { - height: 18 + height: 20 color: 3355443 stroke_color: 16777215 } @@ -15513,7 +15600,7 @@ cont { } path_text { primary { - height: 18 + height: 20 color: 3355443 stroke_color: 16777215 } @@ -15572,7 +15659,7 @@ cont { } path_text { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 452984831 } @@ -15598,7 +15685,7 @@ cont { } path_text { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 452984831 } @@ -15624,7 +15711,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -15664,7 +15751,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -15711,7 +15798,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 452984831 } @@ -15758,7 +15845,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 452984831 } @@ -15805,7 +15892,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 3355443 stroke_color: 452984831 } @@ -15852,7 +15939,7 @@ cont { } path_text { primary { - height: 17 + height: 19 color: 3355443 stroke_color: 67108863 } @@ -15899,7 +15986,7 @@ cont { } path_text { primary { - height: 18 + height: 20 color: 3355443 stroke_color: 16777215 } @@ -15946,7 +16033,7 @@ cont { } path_text { primary { - height: 18 + height: 20 color: 3355443 stroke_color: 16777215 } @@ -16005,7 +16092,7 @@ cont { } path_text { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 452984831 } @@ -16031,7 +16118,7 @@ cont { } path_text { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 452984831 } @@ -16068,7 +16155,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -16105,7 +16192,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -16142,7 +16229,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 452984831 } @@ -16179,7 +16266,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 452984831 } @@ -16216,7 +16303,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 3355443 stroke_color: 452984831 } @@ -16253,7 +16340,7 @@ cont { } path_text { primary { - height: 17 + height: 19 color: 3355443 stroke_color: 67108863 } @@ -16290,7 +16377,7 @@ cont { } path_text { primary { - height: 18 + height: 20 color: 3355443 stroke_color: 16777215 } @@ -16327,7 +16414,7 @@ cont { } path_text { primary { - height: 18 + height: 20 color: 3355443 stroke_color: 16777215 } @@ -16349,7 +16436,7 @@ cont { scale: 10 path_text { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 452984831 } @@ -16360,7 +16447,7 @@ cont { scale: 11 path_text { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 452984831 } @@ -16371,7 +16458,7 @@ cont { scale: 12 path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -16389,7 +16476,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -16422,7 +16509,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 451800027 } @@ -16455,7 +16542,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 451800027 } @@ -16488,7 +16575,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -16521,7 +16608,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 67108863 } @@ -16554,7 +16641,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 16777215 } @@ -16587,7 +16674,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 16777215 } @@ -16609,7 +16696,7 @@ cont { scale: 10 path_text { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 452984831 } @@ -16620,7 +16707,7 @@ cont { scale: 11 path_text { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 452984831 } @@ -16631,7 +16718,7 @@ cont { scale: 12 path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -16649,7 +16736,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -16696,7 +16783,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 451800027 } @@ -16743,7 +16830,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 451800027 } @@ -16790,7 +16877,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -16837,7 +16924,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 67108863 } @@ -16884,7 +16971,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 16777215 } @@ -16931,7 +17018,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 16777215 } @@ -16953,7 +17040,7 @@ cont { scale: 10 path_text { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 452984831 } @@ -16964,7 +17051,7 @@ cont { scale: 11 path_text { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 452984831 } @@ -16975,7 +17062,7 @@ cont { scale: 12 path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -17004,7 +17091,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -17041,7 +17128,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 451800027 } @@ -17078,7 +17165,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 451800027 } @@ -17115,7 +17202,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 452984831 } @@ -17152,7 +17239,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 67108863 } @@ -17189,7 +17276,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 16777215 } @@ -17226,7 +17313,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 3355443 stroke_color: 16777215 } @@ -17275,7 +17362,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 871230427 } @@ -17293,7 +17380,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -17311,7 +17398,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 872415231 } @@ -17329,7 +17416,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 872415231 } @@ -17347,7 +17434,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -17365,7 +17452,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -17406,7 +17493,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 871230427 } @@ -17424,7 +17511,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -17442,7 +17529,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 872415231 } @@ -17460,7 +17547,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 872415231 } @@ -17478,7 +17565,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -17496,7 +17583,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -17551,7 +17638,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 871230427 } @@ -17583,7 +17670,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -17615,7 +17702,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 872415231 } @@ -17647,7 +17734,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 872415231 } @@ -17679,7 +17766,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -17711,7 +17798,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -17752,7 +17839,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 3355443 stroke_color: 871230427 } @@ -17770,7 +17857,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 3355443 stroke_color: 871230427 } @@ -17799,7 +17886,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 872415231 } @@ -17828,7 +17915,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 3355443 stroke_color: 872415231 } @@ -17857,7 +17944,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -17886,7 +17973,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 3355443 stroke_color: 16777215 } @@ -20437,7 +20524,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 3832097 stroke_color: 452984831 offset_y: 10 @@ -20457,7 +20544,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 3832097 stroke_color: 452984831 offset_y: 10 @@ -20477,7 +20564,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 3832097 stroke_color: 452984831 offset_y: 10 @@ -29659,6 +29746,180 @@ cont { } } } +cont { + name: "psurface-unpaved_bad" + element { + scale: 14 + lines { + width: 1.4 + color: 16579836 + dashdot { + dd: 2.0 + dd: 1.35 + } + priority: 1000 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 16579836 + dashdot { + dd: 2.2 + dd: 1.26 + } + priority: 1000 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 2.6 + color: 16579836 + dashdot { + dd: 3.3 + dd: 1.8 + } + priority: 1000 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 17 + lines { + width: 3.0 + color: 16579836 + dashdot { + dd: 4.0 + dd: 1.8 + } + priority: 1000 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 16579836 + dashdot { + dd: 4.0 + dd: 1.8 + } + priority: 1000 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 19 + lines { + width: 4.0 + color: 16579836 + dashdot { + dd: 6.3 + dd: 2.7 + } + priority: 1000 + join: ROUNDJOIN + cap: ROUNDCAP + } + } +} +cont { + name: "psurface-unpaved_good" + element { + scale: 14 + lines { + width: 1.4 + color: 16579836 + dashdot { + dd: 2.0 + dd: 1.35 + } + priority: 1000 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 16579836 + dashdot { + dd: 2.2 + dd: 1.26 + } + priority: 1000 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 2.6 + color: 16579836 + dashdot { + dd: 3.3 + dd: 1.8 + } + priority: 1000 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 17 + lines { + width: 3.0 + color: 16579836 + dashdot { + dd: 4.0 + dd: 1.8 + } + priority: 1000 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 16579836 + dashdot { + dd: 4.0 + dd: 1.8 + } + priority: 1000 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 19 + lines { + width: 4.0 + color: 16579836 + dashdot { + dd: 6.3 + dd: 2.7 + } + priority: 1000 + join: ROUNDJOIN + cap: ROUNDCAP + } + } +} cont { name: "railway-abandoned" element { @@ -30041,7 +30302,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 872415231 offset_y: 8 @@ -30065,7 +30326,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -30089,7 +30350,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -30113,7 +30374,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -30134,7 +30395,7 @@ cont { element { scale: 15 symbol { - name: "railway-crossing_l" + name: "railway-crossing-l" apply_for_type: 1 priority: 16868 } @@ -30142,7 +30403,7 @@ cont { element { scale: 16 symbol { - name: "railway-crossing_l" + name: "railway-crossing-l" apply_for_type: 1 priority: 16868 } @@ -30150,7 +30411,7 @@ cont { element { scale: 17 symbol { - name: "railway-crossing_xl" + name: "railway-crossing-xl" apply_for_type: 1 priority: 16868 } @@ -30158,7 +30419,7 @@ cont { element { scale: 18 symbol { - name: "railway-crossing_xl" + name: "railway-crossing-xl" apply_for_type: 1 priority: 16868 } @@ -30166,7 +30427,7 @@ cont { element { scale: 19 symbol { - name: "railway-crossing_xl" + name: "railway-crossing-xl" apply_for_type: 1 priority: 16868 } @@ -31979,7 +32240,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 872415231 offset_y: 8 @@ -32003,7 +32264,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -32027,7 +32288,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -32044,7 +32305,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -32136,7 +32397,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 872415231 offset_y: 8 @@ -32160,7 +32421,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -32184,7 +32445,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -32201,7 +32462,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -32293,7 +32554,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 872415231 offset_y: 8 @@ -32317,7 +32578,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -32341,7 +32602,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -32358,7 +32619,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -34027,13 +34288,13 @@ cont { element { scale: 17 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 priority: 16894 } caption { primary { - height: 10 + height: 11 color: 4286545791 offset_y: 8 } @@ -34049,13 +34310,13 @@ cont { element { scale: 18 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 priority: 16894 } caption { primary { - height: 10 + height: 11 color: 4286545791 offset_y: 8 } @@ -34071,13 +34332,13 @@ cont { element { scale: 19 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 priority: 16894 } caption { primary { - height: 10 + height: 11 color: 4286545791 offset_y: 8 } @@ -34862,7 +35123,7 @@ cont { element { scale: 16 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 priority: 16894 } @@ -34884,13 +35145,13 @@ cont { element { scale: 17 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 priority: 16894 } caption { primary { - height: 10 + height: 11 color: 4286545791 offset_y: 8 } @@ -34906,13 +35167,13 @@ cont { element { scale: 18 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 priority: 16894 } caption { primary { - height: 10 + height: 11 color: 4286545791 offset_y: 8 } @@ -34928,13 +35189,13 @@ cont { element { scale: 19 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 priority: 16894 } caption { primary { - height: 10 + height: 11 color: 4286545791 offset_y: 8 } @@ -36114,7 +36375,7 @@ cont { element { scale: 17 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 priority: 16894 } @@ -36136,7 +36397,7 @@ cont { element { scale: 18 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 priority: 16894 } @@ -36158,7 +36419,7 @@ cont { element { scale: 19 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 priority: 16894 } @@ -36750,13 +37011,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -36774,13 +37035,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -36798,13 +37059,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -36843,13 +37104,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -36867,13 +37128,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -36891,13 +37152,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -36936,13 +37197,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -36960,13 +37221,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -36984,13 +37245,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -37029,13 +37290,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -37053,13 +37314,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -37077,13 +37338,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -37122,13 +37383,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -37146,13 +37407,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -37170,13 +37431,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -37215,13 +37476,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -37239,13 +37500,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -37263,13 +37524,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -37308,13 +37569,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 872415231 offset_y: 6 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -37332,13 +37593,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 872415231 offset_y: 6 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -37356,13 +37617,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 872415231 offset_y: 6 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -37407,13 +37668,13 @@ cont { } caption { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 452984831 offset_y: 10 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 25 @@ -37431,13 +37692,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 10 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 25 @@ -37455,13 +37716,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 10 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 25 @@ -37500,13 +37761,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -37524,13 +37785,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -37548,13 +37809,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -37593,13 +37854,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -37617,13 +37878,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -37641,13 +37902,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -37686,13 +37947,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -37710,13 +37971,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -37734,13 +37995,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 452984831 offset_y: 8 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 452984831 offset_y: 8 @@ -37785,13 +38046,13 @@ cont { } caption { primary { - height: 12 + height: 13 color: 3355443 stroke_color: 872415231 offset_y: 8 } secondary { - height: 11 + height: 12 color: 3355443 stroke_color: 872415231 offset_y: 25 @@ -37809,13 +38070,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 872415231 offset_y: 8 } secondary { - height: 12 + height: 13 color: 3355443 stroke_color: 872415231 offset_y: 25 @@ -37833,13 +38094,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 3355443 stroke_color: 872415231 offset_y: 8 } secondary { - height: 12 + height: 13 color: 3355443 stroke_color: 872415231 offset_y: 25 @@ -38120,13 +38381,13 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4281545523 stroke_color: 4294967295 offset_y: 8 } secondary { - height: 10 + height: 11 color: 4281545523 stroke_color: 4294967295 offset_y: 8 @@ -38143,13 +38404,13 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4281545523 stroke_color: 4294967295 offset_y: 8 } secondary { - height: 10 + height: 11 color: 4281545523 stroke_color: 4294967295 offset_y: 8 @@ -38166,13 +38427,13 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4281545523 stroke_color: 4294967295 offset_y: 8 } secondary { - height: 10 + height: 11 color: 4281545523 stroke_color: 4294967295 offset_y: 8 @@ -38846,7 +39107,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4473924 offset_y: 8 } @@ -38861,7 +39122,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 8 } @@ -38876,7 +39137,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 8 } @@ -38927,7 +39188,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4473924 offset_y: 8 } @@ -38943,7 +39204,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4473924 offset_y: 8 } @@ -38959,7 +39220,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 8 } @@ -38975,7 +39236,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 8 } @@ -39026,7 +39287,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4473924 offset_y: 8 } @@ -39042,7 +39303,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4473924 offset_y: 8 } @@ -39058,7 +39319,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 8 } @@ -39074,7 +39335,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 4473924 offset_y: 8 } diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index 0d022400ba..c059bf6512 100644 Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index a100835c62..edb14fbf32 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -177,13 +177,13 @@ cont { } caption { primary { - height: 12 + height: 13 color: 8947848 stroke_color: 1292964096 offset_y: 7 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 1292964096 offset_y: 20 @@ -204,13 +204,13 @@ cont { } caption { primary { - height: 12 + height: 13 color: 8947848 stroke_color: 1292964096 offset_y: 7 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 1292964096 offset_y: 20 @@ -231,13 +231,13 @@ cont { } caption { primary { - height: 12 + height: 13 color: 8947848 stroke_color: 1292964096 offset_y: 7 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 1292964096 offset_y: 20 @@ -436,13 +436,13 @@ cont { } caption { primary { - height: 12 + height: 13 color: 8947848 stroke_color: 1292964096 offset_y: 7 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 1292964096 offset_y: 20 @@ -463,13 +463,13 @@ cont { } caption { primary { - height: 12 + height: 13 color: 8947848 stroke_color: 1292964096 offset_y: 7 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 1292964096 offset_y: 20 @@ -490,13 +490,13 @@ cont { } caption { primary { - height: 12 + height: 13 color: 8947848 stroke_color: 1292964096 offset_y: 7 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 1292964096 offset_y: 20 @@ -621,7 +621,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 6710886 offset_y: 10 } @@ -637,7 +637,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -653,7 +653,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -704,7 +704,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 6710886 offset_y: 10 } @@ -720,7 +720,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -736,7 +736,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -754,7 +754,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -769,7 +769,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -787,7 +787,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -802,7 +802,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -821,7 +821,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 6710886 offset_y: 8 } @@ -837,7 +837,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -853,7 +853,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -919,7 +919,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 6710886 offset_y: 8 } @@ -934,7 +934,7 @@ cont { } caption { primary { - height: 12 + height: 14 color: 6710886 offset_y: 8 } @@ -949,7 +949,7 @@ cont { } caption { primary { - height: 12 + height: 14 color: 6710886 offset_y: 8 } @@ -968,7 +968,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 6710886 offset_y: 10 } @@ -984,7 +984,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -1000,7 +1000,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -1098,7 +1098,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 6710886 offset_y: 8 } @@ -1113,7 +1113,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 8 } @@ -1128,7 +1128,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 8 } @@ -1272,7 +1272,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 6710886 offset_y: 10 } @@ -1288,7 +1288,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -1304,7 +1304,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -2376,7 +2376,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 6710886 offset_y: 10 } @@ -2392,7 +2392,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -2408,7 +2408,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -2435,7 +2435,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 6710886 offset_y: 10 } @@ -2451,7 +2451,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -2467,7 +2467,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -2494,7 +2494,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 6710886 offset_y: 10 } @@ -2510,7 +2510,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -2526,7 +2526,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -2553,7 +2553,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 6710886 offset_y: 10 } @@ -2569,7 +2569,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -2585,7 +2585,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -2612,7 +2612,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 6710886 offset_y: 10 } @@ -2628,7 +2628,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -2644,7 +2644,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -2671,7 +2671,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 6710886 offset_y: 10 } @@ -2687,7 +2687,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -2703,7 +2703,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -2730,7 +2730,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 6710886 offset_y: 10 } @@ -2746,7 +2746,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -2762,7 +2762,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -2789,7 +2789,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 6710886 offset_y: 10 } @@ -2805,7 +2805,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -2821,7 +2821,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -2856,7 +2856,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 6710886 offset_y: 10 } @@ -2872,7 +2872,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -2888,7 +2888,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -2965,7 +2965,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 6710886 offset_y: 10 } @@ -2994,7 +2994,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -3022,7 +3022,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 10 } @@ -3156,7 +3156,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 6710886 offset_y: 10 } @@ -3172,7 +3172,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 6710886 offset_y: 10 } @@ -3188,7 +3188,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 6710886 offset_y: 10 } @@ -3579,7 +3579,7 @@ cont { element { scale: 12 symbol { - name: "toll_booth-s" + name: "toll_booth-m" priority: 16868 min_distance: 8 } @@ -3587,7 +3587,7 @@ cont { element { scale: 13 symbol { - name: "toll_booth-s" + name: "toll_booth-m" priority: 16868 min_distance: 8 } @@ -3595,7 +3595,7 @@ cont { element { scale: 14 symbol { - name: "toll_booth-s" + name: "toll_booth-m" priority: 16868 min_distance: 8 } @@ -4466,7 +4466,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 2836760 stroke_color: 437326080 offset_y: 10 @@ -4482,7 +4482,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 2836760 stroke_color: 437326080 offset_y: 10 @@ -4498,7 +4498,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 2836760 stroke_color: 437326080 offset_y: 10 @@ -4543,7 +4543,7 @@ cont { } caption { primary { - height: 13 + height: 15 color: 7566195 text: "addr:housenumber" } @@ -4562,7 +4562,7 @@ cont { } caption { primary { - height: 14 + height: 16 color: 7566195 text: "addr:housenumber" } @@ -4581,7 +4581,7 @@ cont { } caption { primary { - height: 14 + height: 17 color: 7566195 text: "addr:housenumber" } @@ -4611,11 +4611,11 @@ cont { scale: 17 caption { primary { - height: 13 + height: 15 color: 7566195 } secondary { - height: 12 + height: 14 color: 7566195 offset_y: 20 text: "int_name" @@ -4627,11 +4627,11 @@ cont { scale: 18 caption { primary { - height: 14 + height: 16 color: 7566195 } secondary { - height: 13 + height: 15 color: 7566195 offset_y: 20 text: "int_name" @@ -4643,11 +4643,11 @@ cont { scale: 19 caption { primary { - height: 14 + height: 17 color: 7566195 } secondary { - height: 14 + height: 17 color: 7566195 offset_y: 20 text: "int_name" @@ -4692,7 +4692,7 @@ cont { } caption { primary { - height: 13 + height: 15 color: 7566195 text: "addr:housenumber" } @@ -4711,7 +4711,7 @@ cont { } caption { primary { - height: 14 + height: 16 color: 7566195 text: "addr:housenumber" } @@ -4730,7 +4730,7 @@ cont { } caption { primary { - height: 14 + height: 17 color: 7566195 text: "addr:housenumber" } @@ -4774,7 +4774,7 @@ cont { } caption { primary { - height: 13 + height: 15 color: 7566195 text: "addr:housenumber" } @@ -4793,7 +4793,7 @@ cont { } caption { primary { - height: 14 + height: 16 color: 7566195 text: "addr:housenumber" } @@ -4812,7 +4812,7 @@ cont { } caption { primary { - height: 14 + height: 17 color: 7566195 text: "addr:housenumber" } @@ -4955,7 +4955,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 8947848 stroke_color: 856756480 offset_y: 8 @@ -4987,7 +4987,7 @@ cont { } caption { primary { - height: 13 + height: 15 color: 7566195 stroke_color: 440681540 offset_y: 8 @@ -5020,7 +5020,7 @@ cont { } caption { primary { - height: 14 + height: 16 color: 7566195 stroke_color: 440681540 offset_y: 8 @@ -5053,7 +5053,7 @@ cont { } caption { primary { - height: 14 + height: 17 color: 7566195 stroke_color: 440681540 offset_y: 8 @@ -5251,7 +5251,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 9211020 stroke_color: 856756480 } @@ -5269,7 +5269,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -5287,7 +5287,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 856756480 } @@ -5305,7 +5305,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 856756480 } @@ -5323,7 +5323,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -5341,7 +5341,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -5382,7 +5382,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 9211020 stroke_color: 856756480 } @@ -5400,7 +5400,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -5418,7 +5418,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 856756480 } @@ -5436,7 +5436,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 856756480 } @@ -5454,7 +5454,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -5472,7 +5472,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -5513,7 +5513,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 9211020 stroke_color: 856756480 } @@ -5531,7 +5531,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -5560,7 +5560,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 856756480 } @@ -5589,7 +5589,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 856756480 } @@ -5618,7 +5618,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -5647,7 +5647,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -5698,7 +5698,7 @@ cont { } path_text { primary { - height: 12 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -5724,7 +5724,7 @@ cont { } path_text { primary { - height: 12 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -5750,7 +5750,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -5776,7 +5776,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -5809,7 +5809,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 8947848 stroke_color: 437326080 } @@ -5842,7 +5842,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 8947848 stroke_color: 437326080 } @@ -5875,7 +5875,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 8947848 stroke_color: 437326080 } @@ -5908,7 +5908,7 @@ cont { } path_text { primary { - height: 17 + height: 19 color: 8947848 stroke_color: 51450112 } @@ -5941,7 +5941,7 @@ cont { } path_text { primary { - height: 18 + height: 20 color: 8947848 stroke_color: 1118464 } @@ -5974,7 +5974,7 @@ cont { } path_text { primary { - height: 18 + height: 20 color: 8947848 stroke_color: 1118464 } @@ -6033,7 +6033,7 @@ cont { } path_text { primary { - height: 12 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -6059,7 +6059,7 @@ cont { } path_text { primary { - height: 12 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -6085,7 +6085,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -6125,7 +6125,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -6172,7 +6172,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 8947848 stroke_color: 437326080 } @@ -6219,7 +6219,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 8947848 stroke_color: 437326080 } @@ -6266,7 +6266,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 8947848 stroke_color: 437326080 } @@ -6313,7 +6313,7 @@ cont { } path_text { primary { - height: 17 + height: 19 color: 8947848 stroke_color: 51450112 } @@ -6360,7 +6360,7 @@ cont { } path_text { primary { - height: 18 + height: 20 color: 8947848 stroke_color: 1118464 } @@ -6407,7 +6407,7 @@ cont { } path_text { primary { - height: 18 + height: 20 color: 8947848 stroke_color: 1118464 } @@ -6466,7 +6466,7 @@ cont { } path_text { primary { - height: 12 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -6492,7 +6492,7 @@ cont { } path_text { primary { - height: 12 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -6529,7 +6529,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -6566,7 +6566,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -6603,7 +6603,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 8947848 stroke_color: 437326080 } @@ -6640,7 +6640,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 8947848 stroke_color: 437326080 } @@ -6677,7 +6677,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 8947848 stroke_color: 437326080 } @@ -6714,7 +6714,7 @@ cont { } path_text { primary { - height: 17 + height: 19 color: 8947848 stroke_color: 51450112 } @@ -6751,7 +6751,7 @@ cont { } path_text { primary { - height: 18 + height: 20 color: 8947848 stroke_color: 1118464 } @@ -6788,7 +6788,7 @@ cont { } path_text { primary { - height: 18 + height: 20 color: 8947848 stroke_color: 1118464 } @@ -6863,7 +6863,7 @@ cont { scale: 10 path_text { primary { - height: 12 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -6874,7 +6874,7 @@ cont { scale: 11 path_text { primary { - height: 12 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -6885,7 +6885,7 @@ cont { scale: 12 path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -6903,7 +6903,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -6936,7 +6936,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -6969,7 +6969,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 437326080 } @@ -7002,7 +7002,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -7035,7 +7035,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 51450112 } @@ -7068,7 +7068,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 1118464 } @@ -7101,7 +7101,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 1118464 } @@ -7123,7 +7123,7 @@ cont { scale: 10 path_text { primary { - height: 12 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -7134,7 +7134,7 @@ cont { scale: 11 path_text { primary { - height: 12 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -7145,7 +7145,7 @@ cont { scale: 12 path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -7163,7 +7163,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -7210,7 +7210,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -7257,7 +7257,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 437326080 } @@ -7304,7 +7304,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -7351,7 +7351,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 51450112 } @@ -7398,7 +7398,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 1118464 } @@ -7445,7 +7445,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 1118464 } @@ -7467,7 +7467,7 @@ cont { scale: 10 path_text { primary { - height: 12 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -7478,7 +7478,7 @@ cont { scale: 11 path_text { primary { - height: 12 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -7489,7 +7489,7 @@ cont { scale: 12 path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -7518,7 +7518,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -7555,7 +7555,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -7592,7 +7592,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 437326080 } @@ -7629,7 +7629,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -7666,7 +7666,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 51450112 } @@ -7703,7 +7703,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 1118464 } @@ -7740,7 +7740,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 1118464 } @@ -7762,7 +7762,7 @@ cont { scale: 14 path_text { primary { - height: 10 + height: 12 color: 9211020 stroke_color: 856756480 } @@ -7773,7 +7773,7 @@ cont { scale: 15 path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -7784,7 +7784,7 @@ cont { scale: 16 path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -7795,7 +7795,7 @@ cont { scale: 17 path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -7806,7 +7806,7 @@ cont { scale: 18 path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -7817,7 +7817,7 @@ cont { scale: 19 path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -7831,7 +7831,7 @@ cont { scale: 14 path_text { primary { - height: 10 + height: 12 color: 9211020 stroke_color: 856756480 } @@ -7842,7 +7842,7 @@ cont { scale: 15 path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -7853,7 +7853,7 @@ cont { scale: 16 path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -7864,7 +7864,7 @@ cont { scale: 17 path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -7875,7 +7875,7 @@ cont { scale: 18 path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -7886,7 +7886,7 @@ cont { scale: 19 path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -7900,7 +7900,7 @@ cont { scale: 14 path_text { primary { - height: 10 + height: 12 color: 9211020 stroke_color: 856756480 } @@ -7911,7 +7911,7 @@ cont { scale: 15 path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -7922,7 +7922,7 @@ cont { scale: 16 path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -7933,7 +7933,7 @@ cont { scale: 17 path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -7944,7 +7944,7 @@ cont { scale: 18 path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -7955,7 +7955,7 @@ cont { scale: 19 path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -7969,7 +7969,7 @@ cont { scale: 14 path_text { primary { - height: 10 + height: 12 color: 9211020 stroke_color: 856756480 } @@ -7980,7 +7980,7 @@ cont { scale: 15 path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -7991,7 +7991,7 @@ cont { scale: 16 path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -8002,7 +8002,7 @@ cont { scale: 17 path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -8013,7 +8013,7 @@ cont { scale: 18 path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -8024,7 +8024,7 @@ cont { scale: 19 path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -8065,7 +8065,7 @@ cont { } path_text { primary { - height: 11 + height: 12 color: 9211020 stroke_color: 856756480 } @@ -8091,7 +8091,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -8117,7 +8117,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 437326080 } @@ -8143,7 +8143,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 437326080 } @@ -8176,7 +8176,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 8947848 stroke_color: 856756480 } @@ -8209,7 +8209,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 8947848 stroke_color: 856756480 } @@ -8242,7 +8242,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 8947848 stroke_color: 856756480 } @@ -8275,7 +8275,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 8947848 stroke_color: 856756480 } @@ -8308,7 +8308,7 @@ cont { } path_text { primary { - height: 17 + height: 19 color: 8947848 stroke_color: 856756480 } @@ -8341,7 +8341,7 @@ cont { } path_text { primary { - height: 17 + height: 19 color: 8947848 stroke_color: 856756480 } @@ -8390,7 +8390,7 @@ cont { } path_text { primary { - height: 11 + height: 12 color: 9211020 stroke_color: 856756480 } @@ -8416,7 +8416,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -8442,7 +8442,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 437326080 } @@ -8468,7 +8468,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 437326080 } @@ -8515,7 +8515,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 8947848 stroke_color: 856756480 } @@ -8562,7 +8562,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 8947848 stroke_color: 856756480 } @@ -8609,7 +8609,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 8947848 stroke_color: 856756480 } @@ -8656,7 +8656,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 8947848 stroke_color: 856756480 } @@ -8703,7 +8703,7 @@ cont { } path_text { primary { - height: 17 + height: 19 color: 8947848 stroke_color: 856756480 } @@ -8750,7 +8750,7 @@ cont { } path_text { primary { - height: 17 + height: 19 color: 8947848 stroke_color: 856756480 } @@ -8799,7 +8799,7 @@ cont { } path_text { primary { - height: 11 + height: 12 color: 9211020 stroke_color: 856756480 } @@ -8825,7 +8825,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -8851,7 +8851,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 437326080 } @@ -8877,7 +8877,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 437326080 } @@ -8914,7 +8914,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 8947848 stroke_color: 856756480 } @@ -8951,7 +8951,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 8947848 stroke_color: 856756480 } @@ -8988,7 +8988,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 8947848 stroke_color: 856756480 } @@ -9025,7 +9025,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 8947848 stroke_color: 856756480 } @@ -9062,7 +9062,7 @@ cont { } path_text { primary { - height: 17 + height: 19 color: 8947848 stroke_color: 856756480 } @@ -9099,7 +9099,7 @@ cont { } path_text { primary { - height: 17 + height: 19 color: 8947848 stroke_color: 856756480 } @@ -9121,7 +9121,7 @@ cont { scale: 10 path_text { primary { - height: 11 + height: 12 color: 9211020 stroke_color: 856756480 } @@ -9132,7 +9132,7 @@ cont { scale: 11 path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -9143,7 +9143,7 @@ cont { scale: 12 path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 437326080 } @@ -9154,7 +9154,7 @@ cont { scale: 13 path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 437326080 } @@ -9179,7 +9179,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -9212,7 +9212,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -9245,7 +9245,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -9278,7 +9278,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -9311,7 +9311,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 1118464 } @@ -9344,7 +9344,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 1118464 } @@ -9366,7 +9366,7 @@ cont { scale: 10 path_text { primary { - height: 11 + height: 12 color: 9211020 stroke_color: 856756480 } @@ -9377,7 +9377,7 @@ cont { scale: 11 path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -9388,7 +9388,7 @@ cont { scale: 12 path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 437326080 } @@ -9399,7 +9399,7 @@ cont { scale: 13 path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 437326080 } @@ -9438,7 +9438,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -9485,7 +9485,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -9532,7 +9532,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -9579,7 +9579,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -9626,7 +9626,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 1118464 } @@ -9673,7 +9673,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 1118464 } @@ -9695,7 +9695,7 @@ cont { scale: 10 path_text { primary { - height: 11 + height: 12 color: 9211020 stroke_color: 856756480 } @@ -9706,7 +9706,7 @@ cont { scale: 11 path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -9717,7 +9717,7 @@ cont { scale: 12 path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 437326080 } @@ -9728,7 +9728,7 @@ cont { scale: 13 path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 437326080 } @@ -9757,7 +9757,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -9794,7 +9794,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -9831,7 +9831,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -9868,7 +9868,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -9905,7 +9905,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 1118464 } @@ -9942,7 +9942,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 1118464 } @@ -10082,7 +10082,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 6710886 stroke_color: 436207616 } @@ -10108,7 +10108,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 6710886 stroke_color: 436207616 } @@ -10134,7 +10134,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -10167,7 +10167,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 856756480 } @@ -10200,7 +10200,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -10233,7 +10233,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 856756480 } @@ -10266,7 +10266,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 9211020 stroke_color: 1118464 } @@ -10299,7 +10299,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 9211020 stroke_color: 1118464 } @@ -10338,7 +10338,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 6710886 stroke_color: 436207616 } @@ -10364,7 +10364,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 6710886 stroke_color: 436207616 } @@ -10390,7 +10390,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -10423,7 +10423,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 856756480 } @@ -10456,7 +10456,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -10489,7 +10489,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 856756480 } @@ -10522,7 +10522,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 9211020 stroke_color: 1118464 } @@ -10555,7 +10555,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 9211020 stroke_color: 1118464 } @@ -10594,7 +10594,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 6710886 stroke_color: 436207616 } @@ -10620,7 +10620,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 6710886 stroke_color: 436207616 } @@ -10660,7 +10660,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -10707,7 +10707,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 856756480 } @@ -10754,7 +10754,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -10801,7 +10801,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 856756480 } @@ -10848,7 +10848,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 9211020 stroke_color: 1118464 } @@ -10895,7 +10895,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 9211020 stroke_color: 1118464 } @@ -10934,7 +10934,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 6710886 stroke_color: 436207616 } @@ -10960,7 +10960,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 6710886 stroke_color: 436207616 } @@ -10986,7 +10986,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -11019,7 +11019,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 856756480 } @@ -11056,7 +11056,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -11093,7 +11093,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 856756480 } @@ -11130,7 +11130,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 9211020 stroke_color: 1118464 } @@ -11167,7 +11167,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 9211020 stroke_color: 1118464 } @@ -11216,7 +11216,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 9211020 stroke_color: 856756480 } @@ -11234,7 +11234,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -11252,7 +11252,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -11270,7 +11270,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -11288,7 +11288,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -11306,7 +11306,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -11347,7 +11347,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 9211020 stroke_color: 856756480 } @@ -11365,7 +11365,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -11383,7 +11383,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -11401,7 +11401,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -11419,7 +11419,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -11437,7 +11437,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -11478,7 +11478,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 9211020 stroke_color: 856756480 } @@ -11496,7 +11496,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -11514,7 +11514,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -11532,7 +11532,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -11550,7 +11550,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -11568,7 +11568,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -11589,7 +11589,7 @@ cont { } path_text { primary { - height: 11 + height: 12 color: 6710886 stroke_color: 856756480 } @@ -11607,7 +11607,7 @@ cont { } path_text { primary { - height: 11 + height: 12 color: 6710886 stroke_color: 856756480 } @@ -11625,7 +11625,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 6710886 stroke_color: 436207616 } @@ -11651,7 +11651,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 6710886 stroke_color: 436207616 } @@ -11684,7 +11684,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 856756480 } @@ -11717,7 +11717,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -11750,7 +11750,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 8947848 stroke_color: 856756480 } @@ -11783,7 +11783,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 8947848 stroke_color: 856756480 } @@ -11816,7 +11816,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 8947848 stroke_color: 1118464 } @@ -11849,7 +11849,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 8947848 stroke_color: 1118464 } @@ -11878,7 +11878,7 @@ cont { } path_text { primary { - height: 11 + height: 12 color: 6710886 stroke_color: 856756480 } @@ -11896,7 +11896,7 @@ cont { } path_text { primary { - height: 11 + height: 12 color: 6710886 stroke_color: 856756480 } @@ -11914,7 +11914,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 6710886 stroke_color: 436207616 } @@ -11940,7 +11940,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 6710886 stroke_color: 436207616 } @@ -11987,7 +11987,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 856756480 } @@ -12034,7 +12034,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -12081,7 +12081,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 8947848 stroke_color: 856756480 } @@ -12128,7 +12128,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 8947848 stroke_color: 856756480 } @@ -12175,7 +12175,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 8947848 stroke_color: 1118464 } @@ -12222,7 +12222,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 8947848 stroke_color: 1118464 } @@ -12251,7 +12251,7 @@ cont { } path_text { primary { - height: 11 + height: 12 color: 6710886 stroke_color: 856756480 } @@ -12269,7 +12269,7 @@ cont { } path_text { primary { - height: 11 + height: 12 color: 6710886 stroke_color: 856756480 } @@ -12287,7 +12287,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 6710886 stroke_color: 436207616 } @@ -12313,7 +12313,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 6710886 stroke_color: 436207616 } @@ -12346,7 +12346,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 856756480 } @@ -12379,7 +12379,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -12416,7 +12416,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 8947848 stroke_color: 856756480 } @@ -12453,7 +12453,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 8947848 stroke_color: 856756480 } @@ -12490,7 +12490,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 8947848 stroke_color: 1118464 } @@ -12527,7 +12527,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 8947848 stroke_color: 1118464 } @@ -12597,7 +12597,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 8947848 stroke_color: 856756480 } @@ -12622,7 +12622,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 8947848 stroke_color: 856756480 } @@ -12647,7 +12647,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 8947848 stroke_color: 1118464 } @@ -12672,7 +12672,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 8947848 stroke_color: 1118464 } @@ -12776,7 +12776,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 8947848 stroke_color: 856756480 } @@ -12815,7 +12815,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 8947848 stroke_color: 856756480 } @@ -12854,7 +12854,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 8947848 stroke_color: 1118464 } @@ -12893,7 +12893,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 8947848 stroke_color: 1118464 } @@ -12959,7 +12959,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 8947848 stroke_color: 856756480 } @@ -12988,7 +12988,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 8947848 stroke_color: 856756480 } @@ -13017,7 +13017,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 8947848 stroke_color: 1118464 } @@ -13046,7 +13046,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 8947848 stroke_color: 1118464 } @@ -13087,7 +13087,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -13105,7 +13105,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -13123,7 +13123,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -13141,7 +13141,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -13182,7 +13182,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -13200,7 +13200,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -13218,7 +13218,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -13236,7 +13236,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -13277,7 +13277,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -13295,7 +13295,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -13313,7 +13313,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -13331,7 +13331,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -13362,7 +13362,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -13380,7 +13380,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -13398,7 +13398,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -13416,7 +13416,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -13447,7 +13447,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -13465,7 +13465,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -13483,7 +13483,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -13501,7 +13501,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -13532,7 +13532,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -13550,7 +13550,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -13568,7 +13568,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -13586,7 +13586,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -13617,7 +13617,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -13635,7 +13635,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -13653,7 +13653,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -13671,7 +13671,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -13712,7 +13712,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -13730,7 +13730,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -13748,7 +13748,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -13766,7 +13766,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -13807,7 +13807,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -13825,7 +13825,7 @@ cont { } path_text { primary { - height: 12 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -13843,7 +13843,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -13861,7 +13861,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -13951,7 +13951,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 6710886 stroke_color: 436207616 } @@ -13977,7 +13977,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 6710886 stroke_color: 436207616 } @@ -14003,7 +14003,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -14036,7 +14036,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 856756480 } @@ -14069,7 +14069,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -14102,7 +14102,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 856756480 } @@ -14135,7 +14135,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 9211020 stroke_color: 1118464 } @@ -14168,7 +14168,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 9211020 stroke_color: 1118464 } @@ -14207,7 +14207,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 6710886 stroke_color: 436207616 } @@ -14233,7 +14233,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 6710886 stroke_color: 436207616 } @@ -14273,7 +14273,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -14320,7 +14320,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 856756480 } @@ -14367,7 +14367,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -14414,7 +14414,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 856756480 } @@ -14461,7 +14461,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 9211020 stroke_color: 1118464 } @@ -14508,7 +14508,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 9211020 stroke_color: 1118464 } @@ -14547,7 +14547,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 6710886 stroke_color: 436207616 } @@ -14573,7 +14573,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 6710886 stroke_color: 436207616 } @@ -14599,7 +14599,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -14632,7 +14632,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 856756480 } @@ -14669,7 +14669,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 856756480 } @@ -14706,7 +14706,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 856756480 } @@ -14743,7 +14743,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 9211020 stroke_color: 1118464 } @@ -14780,7 +14780,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 9211020 stroke_color: 1118464 } @@ -14867,7 +14867,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 9211020 stroke_color: 1118464 } @@ -14892,7 +14892,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 9211020 stroke_color: 1118464 } @@ -15027,7 +15027,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 9211020 stroke_color: 1118464 } @@ -15066,7 +15066,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 9211020 stroke_color: 1118464 } @@ -15157,7 +15157,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 9211020 stroke_color: 1118464 } @@ -15186,7 +15186,7 @@ cont { } path_text { primary { - height: 15 + height: 17 color: 9211020 stroke_color: 1118464 } @@ -15194,6 +15194,93 @@ cont { } } } +cont { + name: "highway-track-grade1" + element { + scale: 14 + lines { + width: 1.4 + color: 5064516 + dashdot { + dd: 2.0 + dd: 1.35 + } + priority: 1381 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 5064516 + dashdot { + dd: 2.2 + dd: 1.26 + } + priority: 1381 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 2.6 + color: 5064516 + dashdot { + dd: 3.3 + dd: 1.8 + } + priority: 1381 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 17 + lines { + width: 3.0 + color: 5064516 + dashdot { + dd: 4.0 + dd: 1.8 + } + priority: 1381 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 5064516 + dashdot { + dd: 4.0 + dd: 1.8 + } + priority: 1381 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 19 + lines { + width: 4.0 + color: 5064516 + dashdot { + dd: 6.3 + dd: 2.7 + } + priority: 1381 + join: ROUNDJOIN + cap: ROUNDCAP + } + } +} cont { name: "highway-trunk" element { @@ -15237,7 +15324,7 @@ cont { } path_text { primary { - height: 12 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -15263,7 +15350,7 @@ cont { } path_text { primary { - height: 12 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -15289,7 +15376,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -15315,7 +15402,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -15348,7 +15435,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 8947848 stroke_color: 437326080 } @@ -15381,7 +15468,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 8947848 stroke_color: 437326080 } @@ -15414,7 +15501,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 8947848 stroke_color: 437326080 } @@ -15447,7 +15534,7 @@ cont { } path_text { primary { - height: 17 + height: 19 color: 8947848 stroke_color: 51450112 } @@ -15480,7 +15567,7 @@ cont { } path_text { primary { - height: 18 + height: 20 color: 8947848 stroke_color: 1118464 } @@ -15513,7 +15600,7 @@ cont { } path_text { primary { - height: 18 + height: 20 color: 8947848 stroke_color: 1118464 } @@ -15572,7 +15659,7 @@ cont { } path_text { primary { - height: 12 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -15598,7 +15685,7 @@ cont { } path_text { primary { - height: 12 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -15624,7 +15711,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -15664,7 +15751,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -15711,7 +15798,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 8947848 stroke_color: 437326080 } @@ -15758,7 +15845,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 8947848 stroke_color: 437326080 } @@ -15805,7 +15892,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 8947848 stroke_color: 437326080 } @@ -15852,7 +15939,7 @@ cont { } path_text { primary { - height: 17 + height: 19 color: 8947848 stroke_color: 51450112 } @@ -15899,7 +15986,7 @@ cont { } path_text { primary { - height: 18 + height: 20 color: 8947848 stroke_color: 1118464 } @@ -15946,7 +16033,7 @@ cont { } path_text { primary { - height: 18 + height: 20 color: 8947848 stroke_color: 1118464 } @@ -16005,7 +16092,7 @@ cont { } path_text { primary { - height: 12 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -16031,7 +16118,7 @@ cont { } path_text { primary { - height: 12 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -16068,7 +16155,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -16105,7 +16192,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -16142,7 +16229,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 8947848 stroke_color: 437326080 } @@ -16179,7 +16266,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 8947848 stroke_color: 437326080 } @@ -16216,7 +16303,7 @@ cont { } path_text { primary { - height: 16 + height: 18 color: 8947848 stroke_color: 437326080 } @@ -16253,7 +16340,7 @@ cont { } path_text { primary { - height: 17 + height: 19 color: 8947848 stroke_color: 51450112 } @@ -16290,7 +16377,7 @@ cont { } path_text { primary { - height: 18 + height: 20 color: 8947848 stroke_color: 1118464 } @@ -16327,7 +16414,7 @@ cont { } path_text { primary { - height: 18 + height: 20 color: 8947848 stroke_color: 1118464 } @@ -16349,7 +16436,7 @@ cont { scale: 10 path_text { primary { - height: 12 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -16360,7 +16447,7 @@ cont { scale: 11 path_text { primary { - height: 12 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -16371,7 +16458,7 @@ cont { scale: 12 path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -16389,7 +16476,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -16422,7 +16509,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -16455,7 +16542,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 437326080 } @@ -16488,7 +16575,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -16521,7 +16608,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 51450112 } @@ -16554,7 +16641,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 1118464 } @@ -16587,7 +16674,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 1118464 } @@ -16609,7 +16696,7 @@ cont { scale: 10 path_text { primary { - height: 12 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -16620,7 +16707,7 @@ cont { scale: 11 path_text { primary { - height: 12 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -16631,7 +16718,7 @@ cont { scale: 12 path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -16649,7 +16736,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -16696,7 +16783,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -16743,7 +16830,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 437326080 } @@ -16790,7 +16877,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -16837,7 +16924,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 51450112 } @@ -16884,7 +16971,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 1118464 } @@ -16931,7 +17018,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 1118464 } @@ -16953,7 +17040,7 @@ cont { scale: 10 path_text { primary { - height: 12 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -16964,7 +17051,7 @@ cont { scale: 11 path_text { primary { - height: 12 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -16975,7 +17062,7 @@ cont { scale: 12 path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -17004,7 +17091,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -17041,7 +17128,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 437326080 } @@ -17078,7 +17165,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 437326080 } @@ -17115,7 +17202,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 437326080 } @@ -17152,7 +17239,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 51450112 } @@ -17189,7 +17276,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 1118464 } @@ -17226,7 +17313,7 @@ cont { } path_text { primary { - height: 14 + height: 16 color: 9211020 stroke_color: 1118464 } @@ -17275,7 +17362,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 9211020 stroke_color: 856756480 } @@ -17293,7 +17380,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -17311,7 +17398,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 856756480 } @@ -17329,7 +17416,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 856756480 } @@ -17347,7 +17434,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -17365,7 +17452,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -17406,7 +17493,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 9211020 stroke_color: 856756480 } @@ -17424,7 +17511,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -17442,7 +17529,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 856756480 } @@ -17460,7 +17547,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 856756480 } @@ -17478,7 +17565,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -17496,7 +17583,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -17551,7 +17638,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 9211020 stroke_color: 856756480 } @@ -17583,7 +17670,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -17615,7 +17702,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 856756480 } @@ -17647,7 +17734,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 856756480 } @@ -17679,7 +17766,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -17711,7 +17798,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -17752,7 +17839,7 @@ cont { } path_text { primary { - height: 10 + height: 12 color: 9211020 stroke_color: 856756480 } @@ -17770,7 +17857,7 @@ cont { } path_text { primary { - height: 11 + height: 13 color: 9211020 stroke_color: 856756480 } @@ -17799,7 +17886,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 856756480 } @@ -17828,7 +17915,7 @@ cont { } path_text { primary { - height: 12 + height: 14 color: 9211020 stroke_color: 856756480 } @@ -17857,7 +17944,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -17886,7 +17973,7 @@ cont { } path_text { primary { - height: 13 + height: 15 color: 9211020 stroke_color: 1118464 } @@ -20437,7 +20524,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 2836760 stroke_color: 437326080 offset_y: 10 @@ -20457,7 +20544,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 2836760 stroke_color: 437326080 offset_y: 10 @@ -20477,7 +20564,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 2836760 stroke_color: 437326080 offset_y: 10 @@ -29659,6 +29746,180 @@ cont { } } } +cont { + name: "psurface-unpaved_bad" + element { + scale: 14 + lines { + width: 1.4 + color: 5064516 + dashdot { + dd: 2.0 + dd: 1.35 + } + priority: 1000 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 5064516 + dashdot { + dd: 2.2 + dd: 1.26 + } + priority: 1000 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 2.6 + color: 5064516 + dashdot { + dd: 3.3 + dd: 1.8 + } + priority: 1000 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 17 + lines { + width: 3.0 + color: 5064516 + dashdot { + dd: 4.0 + dd: 1.8 + } + priority: 1000 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 5064516 + dashdot { + dd: 4.0 + dd: 1.8 + } + priority: 1000 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 19 + lines { + width: 4.0 + color: 5064516 + dashdot { + dd: 6.3 + dd: 2.7 + } + priority: 1000 + join: ROUNDJOIN + cap: ROUNDCAP + } + } +} +cont { + name: "psurface-unpaved_good" + element { + scale: 14 + lines { + width: 1.4 + color: 5064516 + dashdot { + dd: 2.0 + dd: 1.35 + } + priority: 1000 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 2.0 + color: 5064516 + dashdot { + dd: 2.2 + dd: 1.26 + } + priority: 1000 + join: ROUNDJOIN + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 2.6 + color: 5064516 + dashdot { + dd: 3.3 + dd: 1.8 + } + priority: 1000 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 17 + lines { + width: 3.0 + color: 5064516 + dashdot { + dd: 4.0 + dd: 1.8 + } + priority: 1000 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 5064516 + dashdot { + dd: 4.0 + dd: 1.8 + } + priority: 1000 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 19 + lines { + width: 4.0 + color: 5064516 + dashdot { + dd: 6.3 + dd: 2.7 + } + priority: 1000 + join: ROUNDJOIN + cap: ROUNDCAP + } + } +} cont { name: "railway-abandoned" element { @@ -30041,7 +30302,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 8947848 stroke_color: 856756480 offset_y: 8 @@ -30065,7 +30326,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -30089,7 +30350,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -30113,7 +30374,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -30134,7 +30395,7 @@ cont { element { scale: 15 symbol { - name: "railway-crossing_l" + name: "railway-crossing-l" apply_for_type: 1 priority: 16868 } @@ -30142,7 +30403,7 @@ cont { element { scale: 16 symbol { - name: "railway-crossing_l" + name: "railway-crossing-l" apply_for_type: 1 priority: 16868 } @@ -30150,7 +30411,7 @@ cont { element { scale: 17 symbol { - name: "railway-crossing_xl" + name: "railway-crossing-xl" apply_for_type: 1 priority: 16868 } @@ -30158,7 +30419,7 @@ cont { element { scale: 18 symbol { - name: "railway-crossing_xl" + name: "railway-crossing-xl" apply_for_type: 1 priority: 16868 } @@ -30166,7 +30427,7 @@ cont { element { scale: 19 symbol { - name: "railway-crossing_xl" + name: "railway-crossing-xl" apply_for_type: 1 priority: 16868 } @@ -31979,7 +32240,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 8947848 stroke_color: 856756480 offset_y: 8 @@ -32003,7 +32264,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -32027,7 +32288,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -32044,7 +32305,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -32136,7 +32397,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 8947848 stroke_color: 856756480 offset_y: 8 @@ -32160,7 +32421,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -32184,7 +32445,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -32201,7 +32462,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -32293,7 +32554,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 8947848 stroke_color: 856756480 offset_y: 8 @@ -32317,7 +32578,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -32341,7 +32602,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -32358,7 +32619,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -34027,13 +34288,13 @@ cont { element { scale: 17 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 priority: 16894 } caption { primary { - height: 10 + height: 11 color: 4283782485 offset_y: 8 } @@ -34049,13 +34310,13 @@ cont { element { scale: 18 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 priority: 16894 } caption { primary { - height: 10 + height: 11 color: 4283782485 offset_y: 8 } @@ -34071,13 +34332,13 @@ cont { element { scale: 19 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 priority: 16894 } caption { primary { - height: 10 + height: 11 color: 4283782485 offset_y: 8 } @@ -34862,7 +35123,7 @@ cont { element { scale: 16 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 priority: 16894 } @@ -34884,13 +35145,13 @@ cont { element { scale: 17 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 priority: 16894 } caption { primary { - height: 10 + height: 11 color: 4283782485 offset_y: 8 } @@ -34906,13 +35167,13 @@ cont { element { scale: 18 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 priority: 16894 } caption { primary { - height: 10 + height: 11 color: 4283782485 offset_y: 8 } @@ -34928,13 +35189,13 @@ cont { element { scale: 19 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 priority: 16894 } caption { primary { - height: 10 + height: 11 color: 4283782485 offset_y: 8 } @@ -36114,7 +36375,7 @@ cont { element { scale: 17 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 priority: 16894 } @@ -36136,7 +36397,7 @@ cont { element { scale: 18 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 priority: 16894 } @@ -36158,7 +36419,7 @@ cont { element { scale: 19 symbol { - name: "none" + name: "zero-icon" apply_for_type: 1 priority: 16894 } @@ -36750,13 +37011,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -36774,13 +37035,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -36798,13 +37059,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -36843,13 +37104,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -36867,13 +37128,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -36891,13 +37152,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -36936,13 +37197,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -36960,13 +37221,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -36984,13 +37245,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -37029,13 +37290,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -37053,13 +37314,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -37077,13 +37338,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -37122,13 +37383,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -37146,13 +37407,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -37170,13 +37431,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -37215,13 +37476,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -37239,13 +37500,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -37263,13 +37524,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -37308,13 +37569,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 856756480 offset_y: 6 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -37332,13 +37593,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 856756480 offset_y: 6 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -37356,13 +37617,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 856756480 offset_y: 6 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -37407,13 +37668,13 @@ cont { } caption { primary { - height: 12 + height: 13 color: 8947848 stroke_color: 437326080 offset_y: 10 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 25 @@ -37431,13 +37692,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 10 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 25 @@ -37455,13 +37716,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 10 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 25 @@ -37500,13 +37761,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -37524,13 +37785,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -37548,13 +37809,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -37593,13 +37854,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -37617,13 +37878,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -37641,13 +37902,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -37686,13 +37947,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -37710,13 +37971,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -37734,13 +37995,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 437326080 offset_y: 8 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 437326080 offset_y: 8 @@ -37785,13 +38046,13 @@ cont { } caption { primary { - height: 12 + height: 13 color: 8947848 stroke_color: 856756480 offset_y: 8 } secondary { - height: 11 + height: 12 color: 8947848 stroke_color: 856756480 offset_y: 25 @@ -37809,13 +38070,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 856756480 offset_y: 8 } secondary { - height: 12 + height: 13 color: 8947848 stroke_color: 856756480 offset_y: 25 @@ -37833,13 +38094,13 @@ cont { } caption { primary { - height: 13 + height: 14 color: 8947848 stroke_color: 856756480 offset_y: 8 } secondary { - height: 12 + height: 13 color: 8947848 stroke_color: 856756480 offset_y: 25 @@ -38120,13 +38381,13 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4287137928 stroke_color: 4279308544 offset_y: 8 } secondary { - height: 10 + height: 11 color: 4287137928 stroke_color: 4279308544 offset_y: 8 @@ -38143,13 +38404,13 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4287137928 stroke_color: 4279308544 offset_y: 8 } secondary { - height: 10 + height: 11 color: 4287137928 stroke_color: 4279308544 offset_y: 8 @@ -38166,13 +38427,13 @@ cont { } caption { primary { - height: 12 + height: 13 color: 4287137928 stroke_color: 4279308544 offset_y: 8 } secondary { - height: 10 + height: 11 color: 4287137928 stroke_color: 4279308544 offset_y: 8 @@ -38846,7 +39107,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 6710886 offset_y: 8 } @@ -38861,7 +39122,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 8 } @@ -38876,7 +39137,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 8 } @@ -38927,7 +39188,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 6710886 offset_y: 8 } @@ -38943,7 +39204,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 6710886 offset_y: 8 } @@ -38959,7 +39220,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 8 } @@ -38975,7 +39236,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 8 } @@ -39026,7 +39287,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 6710886 offset_y: 8 } @@ -39042,7 +39303,7 @@ cont { } caption { primary { - height: 12 + height: 13 color: 6710886 offset_y: 8 } @@ -39058,7 +39319,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 8 } @@ -39074,7 +39335,7 @@ cont { } caption { primary { - height: 13 + height: 14 color: 6710886 offset_y: 8 } diff --git a/data/external_resources.txt b/data/external_resources.txt index 956bb57c21..9e36062668 100644 --- a/data/external_resources.txt +++ b/data/external_resources.txt @@ -1,6 +1,6 @@ -WorldCoasts.mwm 4623243 +WorldCoasts.mwm 4630290 WorldCoasts_obsolete.mwm 4513802 -World.mwm 28757709 +World.mwm 28891928 01_dejavusans.ttf 633604 02_droidsans-fallback.ttf 4033420 03_jomolhari-id-a3d.ttf 1817160 diff --git a/data/local_ads_symbols.txt b/data/local_ads_symbols.txt index c0274847a7..7003cb31f6 100644 --- a/data/local_ads_symbols.txt +++ b/data/local_ads_symbols.txt @@ -1 +1,117 @@ -0_test \ No newline at end of file +02001_hospital-l +02002_veterinary-l +02003_pharmacy-l +03001_restaurant-l +03002_bar-l +03003_beer-l +03004_fastfood-l +03005_cafe-l +04001_tourism-l +04002_viewpoint-l +04004_museum-l +04005_gallery-l +04006_zoo-l +04007_theatre-l +04008_cinema-l +04009_casino-l +04010_toilets-l +04021_stadium-l +05001_hotel-l +05002_motel-l +05003_alpine_hut-l +05004_caravan_site-l +05005_apartment-l +05006_hostel-l +06001_convenience-l +06002_marketplace-l +06003_kiosk-l +06004_grocery-l +06005_shop-l +06006_department_store-l +06007_electronics-l +06008_florist-l +06009_shop-bicycle-l +06010_jewelry-l +06011_beauty-l +06012_bakery-l +06013_gift-l +06014_furniture-l +06015_garden_center-l +06016_greengrocer-l +06017_shoes-l +06018_computer-l +06019_hardware-l +06020_doityourself-l +06021_sweets-l +06022_toys-l +06023_butcher-l +06024_mobile_phone-l +06025_optician-l +06026_sports-l +06027_chemist-l +06028_clothes-l +06029_book-shop-l +06030_petshop-l +06031_photo-shop-l +06032_copyshop-l +06033_seafood-shop-l +06034_ticket-shop-l +06035_outdoor-shop-l +06036_alcohol-l +06037_hand-l +06038_car_shop-l +06039_motorcycle_shop-l +06040_travel_agency_shop-l +07001_atm-l +07002_bank-l +07003_banknote-l +08001_fuel-l +08002_charging-station-l +08003_car-repair-l +08004_tire-repair-l +08005_car-sharing-l +08006_car-part-l +08007_car-wash-l +09001_bicycle-l +09002_swimming-l +09003_baseball-l +09004_tennis-l +09005_basketball-l +09006_america-football-l +09007_soccer-l +09008_golf-l +09009_pitch-l +09010_skiing-l +09011_cricket-l +09012_bowls-l +09013_curling-l +09014_diving-l +09015_archery-l +09016_australian-football-l +09017_climbing-l +09018_gym-l +09019_equestrian-l +10001_kindergarten-l +10002_school-l +10003_college-l +10004_library-l +10005_mail-l +10008_historic-ship-l +10012_public-building-l +10013_hairdresser-l +10014_taxi-l +10015_office-l +10016_remains-l +10017_lighthouse-l +10022_laundry-l +10024_dentist-l +10025_bookmaker-l +10026_lawyer-l +10027_sauna-l +10028_picnic-l +10029_campsite-l +10030_hunting-tower-l +10031_bbq-l +10032_cemetery-l +10033_beach-l +10034_dog_park-l diff --git a/data/patterns.txt b/data/patterns.txt index 731be161ad..3a93a4e9c5 100644 --- a/data/patterns.txt +++ b/data/patterns.txt @@ -31,6 +31,11 @@ 8.1 8.1 2.7 2.7 4.95 4.95 +2.0 1.35 +2.2 1.26 +3.3 1.8 +4.0 1.8 +6.3 2.7 10.1 10.1 1.0 12.0 1.15 14.0 diff --git a/data/resources-6plus_clear/symbols-ad.png b/data/resources-6plus_clear/symbols-ad.png index 291bf1e26d..17c2b35e7a 100644 Binary files a/data/resources-6plus_clear/symbols-ad.png and b/data/resources-6plus_clear/symbols-ad.png differ diff --git a/data/resources-6plus_clear/symbols-ad.sdf b/data/resources-6plus_clear/symbols-ad.sdf index 6a879d4d5c..6ca3153b83 100644 --- a/data/resources-6plus_clear/symbols-ad.sdf +++ b/data/resources-6plus_clear/symbols-ad.sdf @@ -1,6 +1,122 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-6plus_clear/symbols.png b/data/resources-6plus_clear/symbols.png index 0c1ceea5b1..63cfeb8b4b 100644 Binary files a/data/resources-6plus_clear/symbols.png and b/data/resources-6plus_clear/symbols.png differ diff --git a/data/resources-6plus_clear/symbols.sdf b/data/resources-6plus_clear/symbols.sdf index e8f3a60f52..71d206e7fa 100644 --- a/data/resources-6plus_clear/symbols.sdf +++ b/data/resources-6plus_clear/symbols.sdf @@ -5,633 +5,642 @@ - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-6plus_dark/symbols-ad.png b/data/resources-6plus_dark/symbols-ad.png index 291bf1e26d..eac73e3cad 100644 Binary files a/data/resources-6plus_dark/symbols-ad.png and b/data/resources-6plus_dark/symbols-ad.png differ diff --git a/data/resources-6plus_dark/symbols-ad.sdf b/data/resources-6plus_dark/symbols-ad.sdf index 6a879d4d5c..6ca3153b83 100644 --- a/data/resources-6plus_dark/symbols-ad.sdf +++ b/data/resources-6plus_dark/symbols-ad.sdf @@ -1,6 +1,122 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png index 5fe4565ff6..8d24d1163c 100644 Binary files a/data/resources-6plus_dark/symbols.png and b/data/resources-6plus_dark/symbols.png differ diff --git a/data/resources-6plus_dark/symbols.sdf b/data/resources-6plus_dark/symbols.sdf index 5fbd93fd56..7522845bb2 100644 --- a/data/resources-6plus_dark/symbols.sdf +++ b/data/resources-6plus_dark/symbols.sdf @@ -1,580 +1,647 @@ - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_clear/symbols-ad.png b/data/resources-hdpi_clear/symbols-ad.png index 1a8d8464ad..7e31cd6cea 100644 Binary files a/data/resources-hdpi_clear/symbols-ad.png and b/data/resources-hdpi_clear/symbols-ad.png differ diff --git a/data/resources-hdpi_clear/symbols-ad.sdf b/data/resources-hdpi_clear/symbols-ad.sdf index f494c0c66d..65a3c153c8 100644 --- a/data/resources-hdpi_clear/symbols-ad.sdf +++ b/data/resources-hdpi_clear/symbols-ad.sdf @@ -1,6 +1,122 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_clear/symbols.png b/data/resources-hdpi_clear/symbols.png index 7c6eee0239..a5f0fb2a47 100644 Binary files a/data/resources-hdpi_clear/symbols.png and b/data/resources-hdpi_clear/symbols.png differ diff --git a/data/resources-hdpi_clear/symbols.sdf b/data/resources-hdpi_clear/symbols.sdf index 7c4b6efeaa..242daf8975 100644 --- a/data/resources-hdpi_clear/symbols.sdf +++ b/data/resources-hdpi_clear/symbols.sdf @@ -5,633 +5,642 @@ - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_dark/symbols-ad.png b/data/resources-hdpi_dark/symbols-ad.png index 1a8d8464ad..faa11e571c 100644 Binary files a/data/resources-hdpi_dark/symbols-ad.png and b/data/resources-hdpi_dark/symbols-ad.png differ diff --git a/data/resources-hdpi_dark/symbols-ad.sdf b/data/resources-hdpi_dark/symbols-ad.sdf index f494c0c66d..65a3c153c8 100644 --- a/data/resources-hdpi_dark/symbols-ad.sdf +++ b/data/resources-hdpi_dark/symbols-ad.sdf @@ -1,6 +1,122 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png index 3ce6e6df06..f0e638db88 100644 Binary files a/data/resources-hdpi_dark/symbols.png and b/data/resources-hdpi_dark/symbols.png differ diff --git a/data/resources-hdpi_dark/symbols.sdf b/data/resources-hdpi_dark/symbols.sdf index 18ff508c50..bae8c7004a 100644 --- a/data/resources-hdpi_dark/symbols.sdf +++ b/data/resources-hdpi_dark/symbols.sdf @@ -5,576 +5,643 @@ - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_clear/symbols-ad.png b/data/resources-mdpi_clear/symbols-ad.png index 309af610b0..906ea4ce32 100644 Binary files a/data/resources-mdpi_clear/symbols-ad.png and b/data/resources-mdpi_clear/symbols-ad.png differ diff --git a/data/resources-mdpi_clear/symbols-ad.sdf b/data/resources-mdpi_clear/symbols-ad.sdf index 0df3c17f90..bd68769ab9 100644 --- a/data/resources-mdpi_clear/symbols-ad.sdf +++ b/data/resources-mdpi_clear/symbols-ad.sdf @@ -1,6 +1,122 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_clear/symbols.png b/data/resources-mdpi_clear/symbols.png index 0e53f99dfa..f360064109 100644 Binary files a/data/resources-mdpi_clear/symbols.png and b/data/resources-mdpi_clear/symbols.png differ diff --git a/data/resources-mdpi_clear/symbols.sdf b/data/resources-mdpi_clear/symbols.sdf index f5b2947031..dcaf9b6a3c 100644 --- a/data/resources-mdpi_clear/symbols.sdf +++ b/data/resources-mdpi_clear/symbols.sdf @@ -5,633 +5,642 @@ - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_dark/symbols-ad.png b/data/resources-mdpi_dark/symbols-ad.png index 309af610b0..0a9fcc3416 100644 Binary files a/data/resources-mdpi_dark/symbols-ad.png and b/data/resources-mdpi_dark/symbols-ad.png differ diff --git a/data/resources-mdpi_dark/symbols-ad.sdf b/data/resources-mdpi_dark/symbols-ad.sdf index 0df3c17f90..bd68769ab9 100644 --- a/data/resources-mdpi_dark/symbols-ad.sdf +++ b/data/resources-mdpi_dark/symbols-ad.sdf @@ -1,6 +1,122 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png index 13c150d777..544d842be2 100644 Binary files a/data/resources-mdpi_dark/symbols.png and b/data/resources-mdpi_dark/symbols.png differ diff --git a/data/resources-mdpi_dark/symbols.sdf b/data/resources-mdpi_dark/symbols.sdf index 55d4f624e5..3337fc45dd 100644 --- a/data/resources-mdpi_dark/symbols.sdf +++ b/data/resources-mdpi_dark/symbols.sdf @@ -5,576 +5,643 @@ - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_clear/symbols-ad.png b/data/resources-xhdpi_clear/symbols-ad.png index 08f974a1e2..dc701f4fb7 100644 Binary files a/data/resources-xhdpi_clear/symbols-ad.png and b/data/resources-xhdpi_clear/symbols-ad.png differ diff --git a/data/resources-xhdpi_clear/symbols-ad.sdf b/data/resources-xhdpi_clear/symbols-ad.sdf index 8963a67f96..8a66fb2147 100644 --- a/data/resources-xhdpi_clear/symbols-ad.sdf +++ b/data/resources-xhdpi_clear/symbols-ad.sdf @@ -1,6 +1,122 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_clear/symbols.png b/data/resources-xhdpi_clear/symbols.png index ba8d7741d3..2a0aff45dd 100644 Binary files a/data/resources-xhdpi_clear/symbols.png and b/data/resources-xhdpi_clear/symbols.png differ diff --git a/data/resources-xhdpi_clear/symbols.sdf b/data/resources-xhdpi_clear/symbols.sdf index b561fa3396..e7501e516f 100644 --- a/data/resources-xhdpi_clear/symbols.sdf +++ b/data/resources-xhdpi_clear/symbols.sdf @@ -5,633 +5,642 @@ - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_dark/symbols-ad.png b/data/resources-xhdpi_dark/symbols-ad.png index 08f974a1e2..01ad02af46 100644 Binary files a/data/resources-xhdpi_dark/symbols-ad.png and b/data/resources-xhdpi_dark/symbols-ad.png differ diff --git a/data/resources-xhdpi_dark/symbols-ad.sdf b/data/resources-xhdpi_dark/symbols-ad.sdf index 8963a67f96..8a66fb2147 100644 --- a/data/resources-xhdpi_dark/symbols-ad.sdf +++ b/data/resources-xhdpi_dark/symbols-ad.sdf @@ -1,6 +1,122 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png index 830d85be00..a52330b0b9 100644 Binary files a/data/resources-xhdpi_dark/symbols.png and b/data/resources-xhdpi_dark/symbols.png differ diff --git a/data/resources-xhdpi_dark/symbols.sdf b/data/resources-xhdpi_dark/symbols.sdf index 2c116e88df..6d48541e4e 100644 --- a/data/resources-xhdpi_dark/symbols.sdf +++ b/data/resources-xhdpi_dark/symbols.sdf @@ -1,580 +1,647 @@ - + - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_clear/symbols-ad.png b/data/resources-xxhdpi_clear/symbols-ad.png index 291bf1e26d..17c2b35e7a 100644 Binary files a/data/resources-xxhdpi_clear/symbols-ad.png and b/data/resources-xxhdpi_clear/symbols-ad.png differ diff --git a/data/resources-xxhdpi_clear/symbols-ad.sdf b/data/resources-xxhdpi_clear/symbols-ad.sdf index 6a879d4d5c..6ca3153b83 100644 --- a/data/resources-xxhdpi_clear/symbols-ad.sdf +++ b/data/resources-xxhdpi_clear/symbols-ad.sdf @@ -1,6 +1,122 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/resources-xxhdpi_clear/symbols.png index 8f29628bdc..9fcbd8daa3 100644 Binary files a/data/resources-xxhdpi_clear/symbols.png and b/data/resources-xxhdpi_clear/symbols.png differ diff --git a/data/resources-xxhdpi_clear/symbols.sdf b/data/resources-xxhdpi_clear/symbols.sdf index c18c53fadb..f813bbe4eb 100644 --- a/data/resources-xxhdpi_clear/symbols.sdf +++ b/data/resources-xxhdpi_clear/symbols.sdf @@ -5,633 +5,642 @@ - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_dark/symbols-ad.png b/data/resources-xxhdpi_dark/symbols-ad.png index 291bf1e26d..eac73e3cad 100644 Binary files a/data/resources-xxhdpi_dark/symbols-ad.png and b/data/resources-xxhdpi_dark/symbols-ad.png differ diff --git a/data/resources-xxhdpi_dark/symbols-ad.sdf b/data/resources-xxhdpi_dark/symbols-ad.sdf index 6a879d4d5c..6ca3153b83 100644 --- a/data/resources-xxhdpi_dark/symbols-ad.sdf +++ b/data/resources-xxhdpi_dark/symbols-ad.sdf @@ -1,6 +1,122 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png index e3150a4ff4..569342fb2f 100644 Binary files a/data/resources-xxhdpi_dark/symbols.png and b/data/resources-xxhdpi_dark/symbols.png differ diff --git a/data/resources-xxhdpi_dark/symbols.sdf b/data/resources-xxhdpi_dark/symbols.sdf index 8513dcf600..049dc69542 100644 --- a/data/resources-xxhdpi_dark/symbols.sdf +++ b/data/resources-xxhdpi_dark/symbols.sdf @@ -5,576 +5,643 @@ - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index c3f178e596..f18673c630 100755 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -338,115 +338,42 @@ node[tourism=hotel], area[tourism=hotel], {z-index: 2818;} +node[sponsored=booking], +area[sponsored=booking], +{z-index: 2820;} /* Booking Hotel Rating >=5 */ -node[tourism=motel][sponsored=booking][rating>=5], -area[tourism=motel][sponsored=booking][rating>=5], -node[tourism=hostel][sponsored=booking][rating>=5], -area[tourism=hostel][sponsored=booking][rating>=5] +node[sponsored=booking][rating>=5], +area[sponsored=booking][rating>=5], {z-index: 2822;} -node[tourism=apartment][sponsored=booking][rating>=5], -area[tourism=apartment][sponsored=booking][rating>=5], -node[tourism=guest_house][sponsored=booking][rating>=5], -area[tourism=guest_house][sponsored=booking][rating>=5] -{z-index: 2824;} - -node[tourism=alpine_hut][sponsored=booking][rating>=5], -area[tourism=alpine_hut][sponsored=booking][rating>=5], -node[tourism=chalet][sponsored=booking][rating>=5], -area[tourism=chalet][sponsored=booking][rating>=5], -node[tourism=resort][sponsored=booking][rating>=5], -area[tourism=resort][sponsored=booking][rating>=5] -{z-index: 2826;} - -node[tourism=hotel][sponsored=booking][rating>=5], -area[tourism=hotel][sponsored=booking][rating>=5], -{z-index: 2828;} - - /* Booking Hotel Rating >=6 */ -node[tourism=motel][sponsored=booking][rating>=6], -area[tourism=motel][sponsored=booking][rating>=6], -node[tourism=hostel][sponsored=booking][rating>=6], -area[tourism=hostel][sponsored=booking][rating>=6] +node[sponsored=booking][rating>=6], +area[sponsored=booking][rating>=6], {z-index: 2832;} -node[tourism=apartment][sponsored=booking][rating>=6], -area[tourism=apartment][sponsored=booking][rating>=6], -node[tourism=guest_house][sponsored=booking][rating>=6], -area[tourism=guest_house][sponsored=booking][rating>=6] -{z-index: 2834;} - -node[tourism=alpine_hut][sponsored=booking][rating>=6], -area[tourism=alpine_hut][sponsored=booking][rating>=6], -node[tourism=chalet][sponsored=booking][rating>=6], -area[tourism=chalet][sponsored=booking][rating>=6], -node[tourism=resort][sponsored=booking][rating>=6], -area[tourism=resort][sponsored=booking][rating>=6] -{z-index: 2836;} - -node[tourism=hotel][sponsored=booking][rating>=6], -area[tourism=hotel][sponsored=booking][rating>=6], -{z-index: 2838;} - /* Booking Hotel Rating >=7 */ -node[tourism=motel][sponsored=booking][rating>=7], -area[tourism=motel][sponsored=booking][rating>=7], -node[tourism=hostel][sponsored=booking][rating>=7], -area[tourism=hostel][sponsored=booking][rating>=7] +node[sponsored=booking][rating>=7], +area[sponsored=booking][rating>=7], {z-index: 2842;} -node[tourism=apartment][sponsored=booking][rating>=7], -area[tourism=apartment][sponsored=booking][rating>=7], -node[tourism=guest_house][sponsored=booking][rating>=7], -area[tourism=guest_house][sponsored=booking][rating>=7] -{z-index: 2844;} - -node[tourism=alpine_hut][sponsored=booking][rating>=7], -area[tourism=alpine_hut][sponsored=booking][rating>=7], -node[tourism=chalet][sponsored=booking][rating>=7], -area[tourism=chalet][sponsored=booking][rating>=7], -node[tourism=resort][sponsored=booking][rating>=7], -area[tourism=resort][sponsored=booking][rating>=7] -{z-index: 2846;} - -node[tourism=hotel][sponsored=booking][rating>=7], -area[tourism=hotel][sponsored=booking][rating>=7], -{z-index: 2848;} - /* Booking Hotel Rating >=8 */ -node[tourism=motel][sponsored=booking][rating>=8], -area[tourism=motel][sponsored=booking][rating>=8], -node[tourism=hostel][sponsored=booking][rating>=8], -area[tourism=hostel][sponsored=booking][rating>=8] +node[sponsored=booking][rating>=8], +area[sponsored=booking][rating>=8], {z-index: 2852;} -node[tourism=apartment][sponsored=booking][rating>=8], -area[tourism=apartment][sponsored=booking][rating>=8], -node[tourism=guest_house][sponsored=booking][rating>=8], -area[tourism=guest_house][sponsored=booking][rating>=8] + +/* Booking Hotel Rating >=9 */ + +node[sponsored=booking][rating>=9], +area[sponsored=booking][rating>=9], {z-index: 2854;} -node[tourism=alpine_hut][sponsored=booking][rating>=8], -area[tourism=alpine_hut][sponsored=booking][rating>=8], -node[tourism=chalet][sponsored=booking][rating>=8], -area[tourism=chalet][sponsored=booking][rating>=8], -node[tourism=resort][sponsored=booking][rating>=8], -area[tourism=resort][sponsored=booking][rating>=8] -{z-index: 2856;} - -node[tourism=hotel][sponsored=booking][rating>=8], -area[tourism=hotel][sponsored=booking][rating>=8], -{z-index: 2858;} - - - node[amenity=place_of_worship], area[amenity=place_of_worship] {z-index: 2872;} @@ -887,8 +814,8 @@ node|z18-[railway=subway_entrance][city=spb]::int_name node|z13[railway=station][transport=subway][city=minsk] {icon-image: subway-minsk-s.svg;text-offset: 4;font-size: 10;text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;icon-min-distance: 1;} node|z14[railway=station][transport=subway][city=minsk] {icon-image: subway-minsk-s.svg;text-offset: 5;} node|z15[railway=station][transport=subway][city=minsk] {icon-image: subway-minsk-m.svg;text-offset: 5;} -node|z16[railway=station][transport=subway][city=minsk] {icon-image: none.svg;font-size: 10;text: name;text-color: @district_label;text-halo-radius: 0;}/*check none*/ -node|z17-[railway=station][transport=subway][city=minsk] {icon-image: none.svg;font-size: 10;text: name;text-color: @district_label;text-halo-radius: 0;}/*check none*/ +node|z16[railway=station][transport=subway][city=minsk] {icon-image: zero-icon.svg;font-size: 10;text: name;text-color: @district_label;text-halo-radius: 0;}/*check none*/ +node|z17-[railway=station][transport=subway][city=minsk] {icon-image: zero-icon.svg;font-size: 10;text: name;text-color: @district_label;text-halo-radius: 0;}/*check none*/ node|z17-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-m.svg;text-offset: 6;font-size: 12;text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;} node|z17[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-m.svg;font-size: 13;} node|z18-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-m.svg;font-size: 13;} @@ -897,7 +824,7 @@ node|z18-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-m.svg;f node|z13[railway=station][transport=subway][city=kiev] {icon-image: subway-kiev-s.svg;text-offset: 8;font-size: 10;text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;icon-min-distance: 1;} node|z14[railway=station][transport=subway][city=kiev] {icon-image: subway-kiev-s.svg;} node|z15-16[railway=station][transport=subway][city=kiev] {icon-image: subway-kiev-m.svg;} -node|z17-[railway=station][transport=subway][city=kiev] {icon-image: none.svg;font-size: 10;text: name;text-color: @district_label;text-halo-radius: 0;}/*check none*/ +node|z17-[railway=station][transport=subway][city=kiev] {icon-image: zero-icon.svg;font-size: 10;text: name;text-color: @district_label;text-halo-radius: 0;}/*check none*/ node|z17-[railway=subway_entrance][city=kiev] {icon-image: subway-kiev-m.svg;font-size: 13;} /* 3.2.5 London Subway Station */ @@ -943,7 +870,7 @@ node|z13[railway=station][transport=subway][city=roma] {icon-image: subway-rome- node|z14[railway=station][transport=subway][city=roma] {icon-image: subway-rome-s.svg;} node|z15[railway=station][transport=subway][city=roma] {icon-image: subway-rome-m.svg;} node|z16[railway=station][transport=subway][city=roma] {icon-image: subway-rome-m.svg;} -node|z17-[railway=station][transport=subway][city=roma] {icon-image: none.svg;text: name;text-color: @district_label;text-halo-radius: 0;} +node|z17-[railway=station][transport=subway][city=roma] {icon-image: zero-icon.svg;text: name;text-color: @district_label;text-halo-radius: 0;} node|z17-[railway=subway_entrance][city=roma] {icon-image: subway-rome-m.svg;} /* 3.2.11 New York Subway Station */ @@ -1333,20 +1260,23 @@ area|z16[amenity=community_centre] /* 4.2 Apartament */ -node|z14-[tourism=hotel], -node|z14-[tourism=hostel], -node|z14-[tourism=guest_house], -area|z14-[tourism=guest_house], -node|z14-[tourism=alpine_hut], -area|z14-[tourism=alpine_hut], -node|z14-[tourism=chalet], -area|z14-[tourism=chalet], -node|z14-[tourism=resort], -area|z14-[tourism=resort], -node|z14-[tourism=motel], -area|z14-[tourism=motel], -node|z14-[tourism=apartment], -area|z14-[tourism=apartment], +node|z14-[sponsored=booking], +node|z14-[sponsored=booking], +{text: name;text-offset: 10;font-size: 10; text-color: @poi_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;} +node|z16-[tourism=hotel], +node|z16-[tourism=hostel], +node|z16-[tourism=guest_house], +area|z16-[tourism=guest_house], +node|z16-[tourism=alpine_hut], +area|z16-[tourism=alpine_hut], +node|z16-[tourism=chalet], +area|z16-[tourism=chalet], +node|z16-[tourism=resort], +area|z16-[tourism=resort], +node|z16-[tourism=motel], +area|z16-[tourism=motel], +node|z16-[tourism=apartment], +area|z16-[tourism=apartment], {text: name;text-offset: 10;font-size: 10; text-color: @poi_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;} node|z15-[tourism=camp_site], area|z15-[tourism=camp_site], @@ -1360,46 +1290,16 @@ node|z16-[tourism=caravan_site], area|z16-[tourism=caravan_site], {text: name;text-color: @poi_label;text-offset: 10;font-size: 10;} -node|z14[tourism=hotel][sponsored=booking][rating>=7] +node|z14[sponsored=booking][rating>=7] {icon-image: hotel-s.svg;text-offset: 6;icon-min-distance: 24;} -node|z14[tourism=hostel][sponsored=booking][rating>=7] -{icon-image: hotel-s.svg;text-offset: 6;icon-min-distance: 24;} -node|z14[tourism=guest_house][sponsored=booking][rating>=7], -area|z14[tourism=guest_house][sponsored=booking][rating>=7] -{icon-image: motel-s.svg;text-offset: 6;icon-min-distance: 24;} -node|z14[tourism=alpine_hut][sponsored=booking][rating>=7], -area|z14[tourism=alpine_hut][sponsored=booking][rating>=7], -node|z14[tourism=chalet][sponsored=booking][rating>=7], -area|z14[tourism=chalet][sponsored=booking][rating>=7], -node|z14[tourism=resort][sponsored=booking][rating>=7], -area|z14[tourism=resort][sponsored=booking][rating>=7] -{icon-image: alpine_hut-s.svg;text-offset: 6;icon-min-distance: 24;} -node|z14[tourism=motel][sponsored=booking][rating>=7], -area|z14[tourism=motel][sponsored=booking][rating>=7], -node|z14[tourism=apartment][sponsored=booking][rating>=7], -area|z14[tourism=apartment][sponsored=booking][rating>=7] -{icon-image: motel-s.svg;text-offset: 6;icon-min-distance: 24;} -node|z15[tourism=hotel][sponsored=booking][rating>=6] -{icon-image: hotel-m.svg;icon-min-distance: 32;} -node|z15[tourism=hostel][sponsored=booking][rating>=6] -{icon-image: hotel-m.svg;icon-min-distance: 32;} -node|z15[tourism=guest_house][sponsored=booking][rating>=6], -area|z15[tourism=guest_house][sponsored=booking][rating>=6] -{icon-image: motel-m.svg;icon-min-distance: 32;} -node|z15[tourism=alpine_hut][sponsored=booking][rating>=6], -area|z15[tourism=alpine_hut][sponsored=booking][rating>=6], -node|z15[tourism=chalet][sponsored=booking][rating>=6], -area|z15[tourism=chalet][sponsored=booking][rating>=6], -node|z15[tourism=resort][sponsored=booking][rating>=6], -area|z15[tourism=resort][sponsored=booking][rating>=6] -{icon-image: alpine_hut-m.svg;icon-min-distance: 32;} -node|z15[tourism=motel][sponsored=booking][rating>=6], -area|z15[tourism=motel][sponsored=booking][rating>=6], -node|z15[tourism=apartment][sponsored=booking][rating>=6], -area|z15[tourism=apartment][sponsored=booking][rating>=6] -{icon-image: motel-m.svg;icon-min-distance: 32;} +node|z15[sponsored=booking][rating>=6] +{icon-image: hotel-m.svg;icon-min-distance: 32;} + + +node|z16[sponsored=booking] +{icon-image: hotel-m.svg;icon-min-distance: 24;} node|z16[tourism=hotel] {icon-image: hotel-m.svg;icon-min-distance: 24;} node|z16[tourism=hostel] @@ -1420,6 +1320,8 @@ node|z16[tourism=apartment], area|z16[tourism=apartment] {icon-image: motel-m.svg;icon-min-distance: 24;} +node|z17[sponsored=booking] +{icon-image: hotel-l.svg;icon-min-distance: 16;} node|z17[tourism=hotel] {icon-image: hotel-l.svg;icon-min-distance: 16;} node|z17[tourism=hostel] @@ -1440,6 +1342,8 @@ node|z17[tourism=apartment], area|z17[tourism=apartment] {icon-image: motel-l.svg;icon-min-distance: 16;} +node|z18-[sponsored=booking] +{icon-image: hotel-l.svg;} node|z18-[tourism=hotel] {icon-image: hotel-l.svg;} node|z18-[tourism=hostel] diff --git a/data/styles/clear/style-clear/6plus/search-adv.png b/data/styles/clear/style-clear/6plus/search-adv.png new file mode 100644 index 0000000000..a65e17d249 Binary files /dev/null and b/data/styles/clear/style-clear/6plus/search-adv.png differ diff --git a/data/styles/clear/style-clear/6plus/search-booking.png b/data/styles/clear/style-clear/6plus/search-booking.png index 8cce8751a4..fa67ead78d 100644 Binary files a/data/styles/clear/style-clear/6plus/search-booking.png and b/data/styles/clear/style-clear/6plus/search-booking.png differ diff --git a/data/styles/clear/style-clear/6plus/search-result.png b/data/styles/clear/style-clear/6plus/search-result.png index 89e8a26e20..1d20ee3766 100644 Binary files a/data/styles/clear/style-clear/6plus/search-result.png and b/data/styles/clear/style-clear/6plus/search-result.png differ diff --git a/data/styles/clear/style-clear/6plus/search-tinkoff.png b/data/styles/clear/style-clear/6plus/search-tinkoff.png index 4d6c72ef2a..e289180826 100644 Binary files a/data/styles/clear/style-clear/6plus/search-tinkoff.png and b/data/styles/clear/style-clear/6plus/search-tinkoff.png differ diff --git a/data/styles/clear/style-clear/hdpi/search-adv.png b/data/styles/clear/style-clear/hdpi/search-adv.png new file mode 100644 index 0000000000..c776cc9d7e Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/search-adv.png differ diff --git a/data/styles/clear/style-clear/hdpi/search-booking.png b/data/styles/clear/style-clear/hdpi/search-booking.png index d0eb136919..19a866d518 100644 Binary files a/data/styles/clear/style-clear/hdpi/search-booking.png and b/data/styles/clear/style-clear/hdpi/search-booking.png differ diff --git a/data/styles/clear/style-clear/hdpi/search-result.png b/data/styles/clear/style-clear/hdpi/search-result.png index 3d179a0cee..4681e99ba7 100644 Binary files a/data/styles/clear/style-clear/hdpi/search-result.png and b/data/styles/clear/style-clear/hdpi/search-result.png differ diff --git a/data/styles/clear/style-clear/hdpi/search-tinkoff.png b/data/styles/clear/style-clear/hdpi/search-tinkoff.png index c0ec4a5bf4..406d658032 100644 Binary files a/data/styles/clear/style-clear/hdpi/search-tinkoff.png and b/data/styles/clear/style-clear/hdpi/search-tinkoff.png differ diff --git a/data/styles/clear/style-clear/mdpi/search-adv.png b/data/styles/clear/style-clear/mdpi/search-adv.png new file mode 100644 index 0000000000..09e2618f90 Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/search-adv.png differ diff --git a/data/styles/clear/style-clear/mdpi/search-booking.png b/data/styles/clear/style-clear/mdpi/search-booking.png index 70dc97add6..5e9cdf86d9 100644 Binary files a/data/styles/clear/style-clear/mdpi/search-booking.png and b/data/styles/clear/style-clear/mdpi/search-booking.png differ diff --git a/data/styles/clear/style-clear/mdpi/search-result.png b/data/styles/clear/style-clear/mdpi/search-result.png index 14fb24f856..64eae9c0e5 100644 Binary files a/data/styles/clear/style-clear/mdpi/search-result.png and b/data/styles/clear/style-clear/mdpi/search-result.png differ diff --git a/data/styles/clear/style-clear/mdpi/search-tinkoff.png b/data/styles/clear/style-clear/mdpi/search-tinkoff.png index 98f26d60cf..cb5f994241 100644 Binary files a/data/styles/clear/style-clear/mdpi/search-tinkoff.png and b/data/styles/clear/style-clear/mdpi/search-tinkoff.png differ diff --git a/data/styles/clear/style-clear/style.mapcss b/data/styles/clear/style-clear/style.mapcss index 1afaaa86fe..13739c04d2 100755 --- a/data/styles/clear/style-clear/style.mapcss +++ b/data/styles/clear/style-clear/style.mapcss @@ -25,7 +25,7 @@ colors Selection-color: #1E96F0; Selection-opacity: 0.64; Route-color: #0087FF; - RouteOutline-color: #871814; + RouteOutline-color: #055FCD; RouteTrafficG0-color: #9B2300; RouteTrafficG1-color: #E82705; RouteTrafficG2-color: #E82705; diff --git a/data/styles/clear/style-clear/symbols-ad/02001_hospital-l.svg b/data/styles/clear/style-clear/symbols-ad/02001_hospital-l.svg new file mode 100644 index 0000000000..ce7a2707f0 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/02001_hospital-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/02002_veterinary-l.svg b/data/styles/clear/style-clear/symbols-ad/02002_veterinary-l.svg new file mode 100644 index 0000000000..852a921d1d --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/02002_veterinary-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/02003_pharmacy-l.svg b/data/styles/clear/style-clear/symbols-ad/02003_pharmacy-l.svg new file mode 100644 index 0000000000..2ca07a27b4 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/02003_pharmacy-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/03001_restaurant-l.svg b/data/styles/clear/style-clear/symbols-ad/03001_restaurant-l.svg new file mode 100644 index 0000000000..0c49d0739a --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/03001_restaurant-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/03002_bar-l.svg b/data/styles/clear/style-clear/symbols-ad/03002_bar-l.svg new file mode 100644 index 0000000000..d1f5511cb2 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/03002_bar-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/03003_beer-l.svg b/data/styles/clear/style-clear/symbols-ad/03003_beer-l.svg new file mode 100644 index 0000000000..45092d3e5c --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/03003_beer-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/03004_fastfood-l.svg b/data/styles/clear/style-clear/symbols-ad/03004_fastfood-l.svg new file mode 100644 index 0000000000..993c02623c --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/03004_fastfood-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/03005_cafe-l.svg b/data/styles/clear/style-clear/symbols-ad/03005_cafe-l.svg new file mode 100644 index 0000000000..dda1a9de8d --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/03005_cafe-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/04001_tourism-l.svg b/data/styles/clear/style-clear/symbols-ad/04001_tourism-l.svg new file mode 100644 index 0000000000..a4ac36dfbc --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/04001_tourism-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/04002_viewpoint-l.svg b/data/styles/clear/style-clear/symbols-ad/04002_viewpoint-l.svg new file mode 100644 index 0000000000..da4cd326f3 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/04002_viewpoint-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/04004_museum-l.svg b/data/styles/clear/style-clear/symbols-ad/04004_museum-l.svg new file mode 100644 index 0000000000..be241c64d2 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/04004_museum-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/04005_gallery-l.svg b/data/styles/clear/style-clear/symbols-ad/04005_gallery-l.svg new file mode 100644 index 0000000000..d2e81dc9bb --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/04005_gallery-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/04006_zoo-l.svg b/data/styles/clear/style-clear/symbols-ad/04006_zoo-l.svg new file mode 100644 index 0000000000..0622124d3b --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/04006_zoo-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/04007_theatre-l.svg b/data/styles/clear/style-clear/symbols-ad/04007_theatre-l.svg new file mode 100644 index 0000000000..8110f323e7 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/04007_theatre-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/04008_cinema-l.svg b/data/styles/clear/style-clear/symbols-ad/04008_cinema-l.svg new file mode 100644 index 0000000000..80c6bd1614 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/04008_cinema-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/04009_casino-l.svg b/data/styles/clear/style-clear/symbols-ad/04009_casino-l.svg new file mode 100644 index 0000000000..09b019d6b0 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/04009_casino-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/04010_toilets-l.svg b/data/styles/clear/style-clear/symbols-ad/04010_toilets-l.svg new file mode 100644 index 0000000000..a6b4057c4d --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/04010_toilets-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/04021_stadium-l.svg b/data/styles/clear/style-clear/symbols-ad/04021_stadium-l.svg new file mode 100644 index 0000000000..119a3cd38e --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/04021_stadium-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/05001_hotel-l.svg b/data/styles/clear/style-clear/symbols-ad/05001_hotel-l.svg new file mode 100644 index 0000000000..3e79abadd0 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/05001_hotel-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/05002_motel-l.svg b/data/styles/clear/style-clear/symbols-ad/05002_motel-l.svg new file mode 100644 index 0000000000..1a4503d839 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/05002_motel-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/05003_alpine_hut-l.svg b/data/styles/clear/style-clear/symbols-ad/05003_alpine_hut-l.svg new file mode 100644 index 0000000000..d192c25d11 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/05003_alpine_hut-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/05004_caravan_site-l.svg b/data/styles/clear/style-clear/symbols-ad/05004_caravan_site-l.svg new file mode 100644 index 0000000000..8e2e7a1c7d --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/05004_caravan_site-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/05005_apartment-l.svg b/data/styles/clear/style-clear/symbols-ad/05005_apartment-l.svg new file mode 100644 index 0000000000..94087e11dd --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/05005_apartment-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/05006_hostel-l.svg b/data/styles/clear/style-clear/symbols-ad/05006_hostel-l.svg new file mode 100644 index 0000000000..f7dc23a96e --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/05006_hostel-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06001_convenience-l.svg b/data/styles/clear/style-clear/symbols-ad/06001_convenience-l.svg new file mode 100644 index 0000000000..751184bae8 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06001_convenience-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06002_marketplace-l.svg b/data/styles/clear/style-clear/symbols-ad/06002_marketplace-l.svg new file mode 100644 index 0000000000..4df88e48bf --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06002_marketplace-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06003_kiosk-l.svg b/data/styles/clear/style-clear/symbols-ad/06003_kiosk-l.svg new file mode 100644 index 0000000000..eb206ce1f3 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06003_kiosk-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06004_grocery-l.svg b/data/styles/clear/style-clear/symbols-ad/06004_grocery-l.svg new file mode 100644 index 0000000000..d213caf6ed --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06004_grocery-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06005_shop-l.svg b/data/styles/clear/style-clear/symbols-ad/06005_shop-l.svg new file mode 100644 index 0000000000..1f656c17e1 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06005_shop-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06006_department_store-l.svg b/data/styles/clear/style-clear/symbols-ad/06006_department_store-l.svg new file mode 100644 index 0000000000..06c16059a9 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06006_department_store-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06007_electronics-l.svg b/data/styles/clear/style-clear/symbols-ad/06007_electronics-l.svg new file mode 100644 index 0000000000..1ee97b6e31 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06007_electronics-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06008_florist-l.svg b/data/styles/clear/style-clear/symbols-ad/06008_florist-l.svg new file mode 100644 index 0000000000..69f2a1aaef --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06008_florist-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06009_shop-bicycle-l.svg b/data/styles/clear/style-clear/symbols-ad/06009_shop-bicycle-l.svg new file mode 100644 index 0000000000..4ea3eba50d --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06009_shop-bicycle-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06010_jewelry-l.svg b/data/styles/clear/style-clear/symbols-ad/06010_jewelry-l.svg new file mode 100644 index 0000000000..b588d3373d --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06010_jewelry-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06011_beauty-l.svg b/data/styles/clear/style-clear/symbols-ad/06011_beauty-l.svg new file mode 100644 index 0000000000..e5d74b5be1 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06011_beauty-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06012_bakery-l.svg b/data/styles/clear/style-clear/symbols-ad/06012_bakery-l.svg new file mode 100644 index 0000000000..b30764e872 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06012_bakery-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06013_gift-l.svg b/data/styles/clear/style-clear/symbols-ad/06013_gift-l.svg new file mode 100644 index 0000000000..062a8a9ca0 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06013_gift-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06014_furniture-l.svg b/data/styles/clear/style-clear/symbols-ad/06014_furniture-l.svg new file mode 100644 index 0000000000..8c4426db3a --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06014_furniture-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06015_garden_center-l.svg b/data/styles/clear/style-clear/symbols-ad/06015_garden_center-l.svg new file mode 100644 index 0000000000..190bc47770 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06015_garden_center-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06016_greengrocer-l.svg b/data/styles/clear/style-clear/symbols-ad/06016_greengrocer-l.svg new file mode 100644 index 0000000000..ec1b4cdacc --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06016_greengrocer-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06017_shoes-l.svg b/data/styles/clear/style-clear/symbols-ad/06017_shoes-l.svg new file mode 100644 index 0000000000..543a9a650c --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06017_shoes-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06018_computer-l.svg b/data/styles/clear/style-clear/symbols-ad/06018_computer-l.svg new file mode 100644 index 0000000000..7e859d3b56 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06018_computer-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06019_hardware-l.svg b/data/styles/clear/style-clear/symbols-ad/06019_hardware-l.svg new file mode 100644 index 0000000000..5d6ec2d73c --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06019_hardware-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06020_doityourself-l.svg b/data/styles/clear/style-clear/symbols-ad/06020_doityourself-l.svg new file mode 100644 index 0000000000..a34da49332 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06020_doityourself-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06021_sweets-l.svg b/data/styles/clear/style-clear/symbols-ad/06021_sweets-l.svg new file mode 100644 index 0000000000..4778ac7a7b --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06021_sweets-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06022_toys-l.svg b/data/styles/clear/style-clear/symbols-ad/06022_toys-l.svg new file mode 100644 index 0000000000..5bdfb2a43f --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06022_toys-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06023_butcher-l.svg b/data/styles/clear/style-clear/symbols-ad/06023_butcher-l.svg new file mode 100644 index 0000000000..16216b5ccc --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06023_butcher-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06024_mobile_phone-l.svg b/data/styles/clear/style-clear/symbols-ad/06024_mobile_phone-l.svg new file mode 100644 index 0000000000..fd8a2bab83 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06024_mobile_phone-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06025_optician-l.svg b/data/styles/clear/style-clear/symbols-ad/06025_optician-l.svg new file mode 100644 index 0000000000..486f65cf81 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06025_optician-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06026_sports-l.svg b/data/styles/clear/style-clear/symbols-ad/06026_sports-l.svg new file mode 100644 index 0000000000..631add08f5 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06026_sports-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06027_chemist-l.svg b/data/styles/clear/style-clear/symbols-ad/06027_chemist-l.svg new file mode 100644 index 0000000000..75689a5b1c --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06027_chemist-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06028_clothes-l.svg b/data/styles/clear/style-clear/symbols-ad/06028_clothes-l.svg new file mode 100644 index 0000000000..c418a32348 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06028_clothes-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06029_book-shop-l.svg b/data/styles/clear/style-clear/symbols-ad/06029_book-shop-l.svg new file mode 100644 index 0000000000..b75db29e12 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06029_book-shop-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06030_petshop-l.svg b/data/styles/clear/style-clear/symbols-ad/06030_petshop-l.svg new file mode 100644 index 0000000000..b7f96ae1f1 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06030_petshop-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06031_photo-shop-l.svg b/data/styles/clear/style-clear/symbols-ad/06031_photo-shop-l.svg new file mode 100644 index 0000000000..6c764c03de --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06031_photo-shop-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06032_copyshop-l.svg b/data/styles/clear/style-clear/symbols-ad/06032_copyshop-l.svg new file mode 100644 index 0000000000..828b4ebaa4 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06032_copyshop-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06033_seafood-shop-l.svg b/data/styles/clear/style-clear/symbols-ad/06033_seafood-shop-l.svg new file mode 100644 index 0000000000..31c50de3f7 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06033_seafood-shop-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06034_ticket-shop-l.svg b/data/styles/clear/style-clear/symbols-ad/06034_ticket-shop-l.svg new file mode 100644 index 0000000000..4b69709e6c --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06034_ticket-shop-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06035_outdoor-shop-l.svg b/data/styles/clear/style-clear/symbols-ad/06035_outdoor-shop-l.svg new file mode 100644 index 0000000000..6ac857ddea --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06035_outdoor-shop-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06036_alcohol-l.svg b/data/styles/clear/style-clear/symbols-ad/06036_alcohol-l.svg new file mode 100644 index 0000000000..7978dea2c9 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06036_alcohol-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06037_hand-l.svg b/data/styles/clear/style-clear/symbols-ad/06037_hand-l.svg new file mode 100644 index 0000000000..5113308351 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06037_hand-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06038_car_shop-l.svg b/data/styles/clear/style-clear/symbols-ad/06038_car_shop-l.svg new file mode 100644 index 0000000000..021c3dfd0e --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06038_car_shop-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06039_motorcycle_shop-l.svg b/data/styles/clear/style-clear/symbols-ad/06039_motorcycle_shop-l.svg new file mode 100644 index 0000000000..8821aaac3a --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06039_motorcycle_shop-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/06040_travel_agency_shop-l.svg b/data/styles/clear/style-clear/symbols-ad/06040_travel_agency_shop-l.svg new file mode 100644 index 0000000000..1491cbdd37 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/06040_travel_agency_shop-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/07001_atm-l.svg b/data/styles/clear/style-clear/symbols-ad/07001_atm-l.svg new file mode 100644 index 0000000000..827619be56 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/07001_atm-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/07002_bank-l.svg b/data/styles/clear/style-clear/symbols-ad/07002_bank-l.svg new file mode 100644 index 0000000000..81ac4705c4 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/07002_bank-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/07003_banknote-l.svg b/data/styles/clear/style-clear/symbols-ad/07003_banknote-l.svg new file mode 100644 index 0000000000..ed2ba37241 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/07003_banknote-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/08001_fuel-l.svg b/data/styles/clear/style-clear/symbols-ad/08001_fuel-l.svg new file mode 100644 index 0000000000..fa88cc3db5 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/08001_fuel-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/08002_charging-station-l.svg b/data/styles/clear/style-clear/symbols-ad/08002_charging-station-l.svg new file mode 100644 index 0000000000..9e25faebb0 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/08002_charging-station-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/08003_car-repair-l.svg b/data/styles/clear/style-clear/symbols-ad/08003_car-repair-l.svg new file mode 100644 index 0000000000..0f2b617b8f --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/08003_car-repair-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/08004_tire-repair-l.svg b/data/styles/clear/style-clear/symbols-ad/08004_tire-repair-l.svg new file mode 100644 index 0000000000..aedabc4ce6 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/08004_tire-repair-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/08005_car-sharing-l.svg b/data/styles/clear/style-clear/symbols-ad/08005_car-sharing-l.svg new file mode 100644 index 0000000000..ca1f656dbe --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/08005_car-sharing-l.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/08006_car-part-l.svg b/data/styles/clear/style-clear/symbols-ad/08006_car-part-l.svg new file mode 100644 index 0000000000..b743a64bee --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/08006_car-part-l.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/08007_car-wash-l.svg b/data/styles/clear/style-clear/symbols-ad/08007_car-wash-l.svg new file mode 100644 index 0000000000..6460dad7d5 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/08007_car-wash-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/09001_bicycle-l.svg b/data/styles/clear/style-clear/symbols-ad/09001_bicycle-l.svg new file mode 100644 index 0000000000..b993379a88 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/09001_bicycle-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/09002_swimming-l.svg b/data/styles/clear/style-clear/symbols-ad/09002_swimming-l.svg new file mode 100644 index 0000000000..07ad88095d --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/09002_swimming-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/09003_baseball-l.svg b/data/styles/clear/style-clear/symbols-ad/09003_baseball-l.svg new file mode 100644 index 0000000000..d2a0ff9f65 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/09003_baseball-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/09004_tennis-l.svg b/data/styles/clear/style-clear/symbols-ad/09004_tennis-l.svg new file mode 100644 index 0000000000..601eccbd3d --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/09004_tennis-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/09005_basketball-l.svg b/data/styles/clear/style-clear/symbols-ad/09005_basketball-l.svg new file mode 100644 index 0000000000..d3a4e3a75d --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/09005_basketball-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/09006_america-football-l.svg b/data/styles/clear/style-clear/symbols-ad/09006_america-football-l.svg new file mode 100644 index 0000000000..c1f1cf1b64 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/09006_america-football-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/09007_soccer-l.svg b/data/styles/clear/style-clear/symbols-ad/09007_soccer-l.svg new file mode 100644 index 0000000000..a2fd33332e --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/09007_soccer-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/09008_golf-l.svg b/data/styles/clear/style-clear/symbols-ad/09008_golf-l.svg new file mode 100644 index 0000000000..8a9ad797a7 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/09008_golf-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/09009_pitch-l.svg b/data/styles/clear/style-clear/symbols-ad/09009_pitch-l.svg new file mode 100644 index 0000000000..3b084734b3 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/09009_pitch-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/09010_skiing-l.svg b/data/styles/clear/style-clear/symbols-ad/09010_skiing-l.svg new file mode 100644 index 0000000000..9cb024634d --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/09010_skiing-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/09011_cricket-l.svg b/data/styles/clear/style-clear/symbols-ad/09011_cricket-l.svg new file mode 100644 index 0000000000..2a64c73cc0 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/09011_cricket-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/09012_bowls-l.svg b/data/styles/clear/style-clear/symbols-ad/09012_bowls-l.svg new file mode 100644 index 0000000000..943501a113 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/09012_bowls-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/09013_curling-l.svg b/data/styles/clear/style-clear/symbols-ad/09013_curling-l.svg new file mode 100644 index 0000000000..c09ac95b7c --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/09013_curling-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/09014_diving-l.svg b/data/styles/clear/style-clear/symbols-ad/09014_diving-l.svg new file mode 100644 index 0000000000..26fdb0611c --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/09014_diving-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/09015_archery-l.svg b/data/styles/clear/style-clear/symbols-ad/09015_archery-l.svg new file mode 100644 index 0000000000..4051baed26 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/09015_archery-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/09016_australian-football-l.svg b/data/styles/clear/style-clear/symbols-ad/09016_australian-football-l.svg new file mode 100644 index 0000000000..416de8752c --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/09016_australian-football-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/09017_climbing-l.svg b/data/styles/clear/style-clear/symbols-ad/09017_climbing-l.svg new file mode 100644 index 0000000000..1da36e3732 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/09017_climbing-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/09018_gym-l.svg b/data/styles/clear/style-clear/symbols-ad/09018_gym-l.svg new file mode 100644 index 0000000000..7cf0ef6cc9 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/09018_gym-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/09019_equestrian-l.svg b/data/styles/clear/style-clear/symbols-ad/09019_equestrian-l.svg new file mode 100644 index 0000000000..a4350b9d78 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/09019_equestrian-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/0_test.svg b/data/styles/clear/style-clear/symbols-ad/0_test.svg deleted file mode 100644 index 2f1ac91ac9..0000000000 --- a/data/styles/clear/style-clear/symbols-ad/0_test.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/data/styles/clear/style-clear/symbols-ad/10001_kindergarten-l.svg b/data/styles/clear/style-clear/symbols-ad/10001_kindergarten-l.svg new file mode 100644 index 0000000000..9c96809cb8 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/10001_kindergarten-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/10002_school-l.svg b/data/styles/clear/style-clear/symbols-ad/10002_school-l.svg new file mode 100644 index 0000000000..2080df84a5 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/10002_school-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/10003_college-l.svg b/data/styles/clear/style-clear/symbols-ad/10003_college-l.svg new file mode 100644 index 0000000000..f22519538f --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/10003_college-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/10004_library-l.svg b/data/styles/clear/style-clear/symbols-ad/10004_library-l.svg new file mode 100644 index 0000000000..570dc9143a --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/10004_library-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/10005_mail-l.svg b/data/styles/clear/style-clear/symbols-ad/10005_mail-l.svg new file mode 100644 index 0000000000..6c7f4e7337 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/10005_mail-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/10008_historic-ship-l.svg b/data/styles/clear/style-clear/symbols-ad/10008_historic-ship-l.svg new file mode 100644 index 0000000000..eeb48ef8d3 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/10008_historic-ship-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/10012_public-building-l.svg b/data/styles/clear/style-clear/symbols-ad/10012_public-building-l.svg new file mode 100644 index 0000000000..09724a5297 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/10012_public-building-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/10013_hairdresser-l.svg b/data/styles/clear/style-clear/symbols-ad/10013_hairdresser-l.svg new file mode 100644 index 0000000000..2458ae47db --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/10013_hairdresser-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/10014_taxi-l.svg b/data/styles/clear/style-clear/symbols-ad/10014_taxi-l.svg new file mode 100644 index 0000000000..11db7d97fd --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/10014_taxi-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/10015_office-l.svg b/data/styles/clear/style-clear/symbols-ad/10015_office-l.svg new file mode 100644 index 0000000000..819dd2b96b --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/10015_office-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/10016_remains-l.svg b/data/styles/clear/style-clear/symbols-ad/10016_remains-l.svg new file mode 100644 index 0000000000..205b4a221f --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/10016_remains-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/10017_lighthouse-l.svg b/data/styles/clear/style-clear/symbols-ad/10017_lighthouse-l.svg new file mode 100644 index 0000000000..f72fe8768f --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/10017_lighthouse-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/10022_laundry-l.svg b/data/styles/clear/style-clear/symbols-ad/10022_laundry-l.svg new file mode 100644 index 0000000000..875878b558 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/10022_laundry-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/10024_dentist-l.svg b/data/styles/clear/style-clear/symbols-ad/10024_dentist-l.svg new file mode 100644 index 0000000000..26cd0a22ed --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/10024_dentist-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/10025_bookmaker-l.svg b/data/styles/clear/style-clear/symbols-ad/10025_bookmaker-l.svg new file mode 100644 index 0000000000..38ba55d4a5 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/10025_bookmaker-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/10026_lawyer-l.svg b/data/styles/clear/style-clear/symbols-ad/10026_lawyer-l.svg new file mode 100644 index 0000000000..a617faf5db --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/10026_lawyer-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/10027_sauna-l.svg b/data/styles/clear/style-clear/symbols-ad/10027_sauna-l.svg new file mode 100644 index 0000000000..a6a6406af7 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/10027_sauna-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/10028_picnic-l.svg b/data/styles/clear/style-clear/symbols-ad/10028_picnic-l.svg new file mode 100644 index 0000000000..77ddfbe8ed --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/10028_picnic-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/10029_campsite-l.svg b/data/styles/clear/style-clear/symbols-ad/10029_campsite-l.svg new file mode 100644 index 0000000000..08438865b9 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/10029_campsite-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/10030_hunting-tower-l.svg b/data/styles/clear/style-clear/symbols-ad/10030_hunting-tower-l.svg new file mode 100644 index 0000000000..ef0c1561cd --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/10030_hunting-tower-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/10031_bbq-l.svg b/data/styles/clear/style-clear/symbols-ad/10031_bbq-l.svg new file mode 100644 index 0000000000..400c235edb --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/10031_bbq-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/10032_cemetery-l.svg b/data/styles/clear/style-clear/symbols-ad/10032_cemetery-l.svg new file mode 100644 index 0000000000..55af395ae2 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/10032_cemetery-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/10033_beach-l.svg b/data/styles/clear/style-clear/symbols-ad/10033_beach-l.svg new file mode 100644 index 0000000000..c7216688d8 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/10033_beach-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols-ad/10034_dog_park-l.svg b/data/styles/clear/style-clear/symbols-ad/10034_dog_park-l.svg new file mode 100644 index 0000000000..1915c6dcc0 --- /dev/null +++ b/data/styles/clear/style-clear/symbols-ad/10034_dog_park-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/airport-l.svg b/data/styles/clear/style-clear/symbols/airport-l.svg index 2c513bfa28..9de24950fc 100644 --- a/data/styles/clear/style-clear/symbols/airport-l.svg +++ b/data/styles/clear/style-clear/symbols/airport-l.svg @@ -1,27 +1,7 @@ - - - - airport-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/airport-m.svg b/data/styles/clear/style-clear/symbols/airport-m.svg index 48074a3db1..b4215674d5 100644 --- a/data/styles/clear/style-clear/symbols/airport-m.svg +++ b/data/styles/clear/style-clear/symbols/airport-m.svg @@ -1,23 +1,7 @@ - - - - airport-m - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/airport-s.svg b/data/styles/clear/style-clear/symbols/airport-s.svg index e06e66c934..efedcc836e 100644 --- a/data/styles/clear/style-clear/symbols/airport-s.svg +++ b/data/styles/clear/style-clear/symbols/airport-s.svg @@ -1,23 +1,7 @@ - - - - airport-s - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/alcohol-l.svg b/data/styles/clear/style-clear/symbols/alcohol-l.svg index 5683d001c5..a2bca51115 100644 --- a/data/styles/clear/style-clear/symbols/alcohol-l.svg +++ b/data/styles/clear/style-clear/symbols/alcohol-l.svg @@ -1,19 +1,7 @@ - - - - alcohol-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/alcohol-m.svg b/data/styles/clear/style-clear/symbols/alcohol-m.svg index 38bfe0b086..222f096368 100644 --- a/data/styles/clear/style-clear/symbols/alcohol-m.svg +++ b/data/styles/clear/style-clear/symbols/alcohol-m.svg @@ -1,19 +1,7 @@ - - - - alcohol-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/alcohol-s.svg b/data/styles/clear/style-clear/symbols/alcohol-s.svg index acc7e858dc..b816731f44 100644 --- a/data/styles/clear/style-clear/symbols/alcohol-s.svg +++ b/data/styles/clear/style-clear/symbols/alcohol-s.svg @@ -1,19 +1,7 @@ - - - - alcohol-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/alpine_hut-l.svg b/data/styles/clear/style-clear/symbols/alpine_hut-l.svg index 8b5bf51f3f..b01355ca45 100644 --- a/data/styles/clear/style-clear/symbols/alpine_hut-l.svg +++ b/data/styles/clear/style-clear/symbols/alpine_hut-l.svg @@ -1,16 +1,7 @@ - - - - alpine_hut-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/alpine_hut-m.svg b/data/styles/clear/style-clear/symbols/alpine_hut-m.svg index b6abb1b82c..34fd67fe80 100644 --- a/data/styles/clear/style-clear/symbols/alpine_hut-m.svg +++ b/data/styles/clear/style-clear/symbols/alpine_hut-m.svg @@ -1,16 +1,7 @@ - - - - alpine_hut-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/alpine_hut-s.svg b/data/styles/clear/style-clear/symbols/alpine_hut-s.svg index 474beab2f6..7140433a5c 100644 --- a/data/styles/clear/style-clear/symbols/alpine_hut-s.svg +++ b/data/styles/clear/style-clear/symbols/alpine_hut-s.svg @@ -1,14 +1,7 @@ - - - - alpine_hut-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/america-football-l.svg b/data/styles/clear/style-clear/symbols/america-football-l.svg index b875b9a4b4..b9ba22f210 100644 --- a/data/styles/clear/style-clear/symbols/america-football-l.svg +++ b/data/styles/clear/style-clear/symbols/america-football-l.svg @@ -1,19 +1,7 @@ - - - - america-football-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/america-football-m.svg b/data/styles/clear/style-clear/symbols/america-football-m.svg index 74d57de676..5209510051 100644 --- a/data/styles/clear/style-clear/symbols/america-football-m.svg +++ b/data/styles/clear/style-clear/symbols/america-football-m.svg @@ -1,19 +1,7 @@ - - - - america-football-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/america-football-s.svg b/data/styles/clear/style-clear/symbols/america-football-s.svg index edc1e5bc08..dee65c5719 100644 --- a/data/styles/clear/style-clear/symbols/america-football-s.svg +++ b/data/styles/clear/style-clear/symbols/america-football-s.svg @@ -1,19 +1,7 @@ - - - - america-football-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/apartment-l.svg b/data/styles/clear/style-clear/symbols/apartment-l.svg index 1d84814c0f..8aabbd1840 100644 --- a/data/styles/clear/style-clear/symbols/apartment-l.svg +++ b/data/styles/clear/style-clear/symbols/apartment-l.svg @@ -1,16 +1,7 @@ - - - - apartment-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/apartment-m.svg b/data/styles/clear/style-clear/symbols/apartment-m.svg index 69ebeb0cf0..ee2c5f5719 100644 --- a/data/styles/clear/style-clear/symbols/apartment-m.svg +++ b/data/styles/clear/style-clear/symbols/apartment-m.svg @@ -1,16 +1,7 @@ - - - - apartment-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/apartment-s.svg b/data/styles/clear/style-clear/symbols/apartment-s.svg index af0bdc8b74..c247aa6ac4 100644 --- a/data/styles/clear/style-clear/symbols/apartment-s.svg +++ b/data/styles/clear/style-clear/symbols/apartment-s.svg @@ -1,14 +1,7 @@ - - - - apartment-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/archery-l.svg b/data/styles/clear/style-clear/symbols/archery-l.svg index ecdcf98c82..a6cda5e19a 100644 --- a/data/styles/clear/style-clear/symbols/archery-l.svg +++ b/data/styles/clear/style-clear/symbols/archery-l.svg @@ -1,19 +1,7 @@ - - - - archery-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/archery-m.svg b/data/styles/clear/style-clear/symbols/archery-m.svg index 3ffca64e7b..99f6b67e5b 100644 --- a/data/styles/clear/style-clear/symbols/archery-m.svg +++ b/data/styles/clear/style-clear/symbols/archery-m.svg @@ -1,19 +1,7 @@ - - - - archery-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/archery-s.svg b/data/styles/clear/style-clear/symbols/archery-s.svg index b3d2e7c1db..a999ca7d75 100644 --- a/data/styles/clear/style-clear/symbols/archery-s.svg +++ b/data/styles/clear/style-clear/symbols/archery-s.svg @@ -1,19 +1,7 @@ - - - - archery-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/arrow-m.svg b/data/styles/clear/style-clear/symbols/arrow-m.svg index 22fc44ba96..89e8749766 100644 --- a/data/styles/clear/style-clear/symbols/arrow-m.svg +++ b/data/styles/clear/style-clear/symbols/arrow-m.svg @@ -1,12 +1,3 @@ - - - - arrow-m - Created with Sketch. - - - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-clear/symbols/arrow-s.svg b/data/styles/clear/style-clear/symbols/arrow-s.svg index 7cdcbecbc6..42c43529d8 100644 --- a/data/styles/clear/style-clear/symbols/arrow-s.svg +++ b/data/styles/clear/style-clear/symbols/arrow-s.svg @@ -1,12 +1,3 @@ - - - - arrow-s - Created with Sketch. - - - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-clear/symbols/arrow-xs.svg b/data/styles/clear/style-clear/symbols/arrow-xs.svg index d2ecba9d93..c4b826940a 100644 --- a/data/styles/clear/style-clear/symbols/arrow-xs.svg +++ b/data/styles/clear/style-clear/symbols/arrow-xs.svg @@ -1,14 +1,3 @@ - - - - arrow-xs - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-clear/symbols/atm-l.svg b/data/styles/clear/style-clear/symbols/atm-l.svg index 237e11bf87..47daccac29 100644 --- a/data/styles/clear/style-clear/symbols/atm-l.svg +++ b/data/styles/clear/style-clear/symbols/atm-l.svg @@ -1,16 +1,7 @@ - - - - atm-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/atm-m.svg b/data/styles/clear/style-clear/symbols/atm-m.svg index 6945303929..ac669417d7 100644 --- a/data/styles/clear/style-clear/symbols/atm-m.svg +++ b/data/styles/clear/style-clear/symbols/atm-m.svg @@ -1,16 +1,7 @@ - - - - atm-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/atm-s.svg b/data/styles/clear/style-clear/symbols/atm-s.svg index 35d146ef0c..d6018ebade 100644 --- a/data/styles/clear/style-clear/symbols/atm-s.svg +++ b/data/styles/clear/style-clear/symbols/atm-s.svg @@ -1,16 +1,7 @@ - - - - atm-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/australian-football-l.svg b/data/styles/clear/style-clear/symbols/australian-football-l.svg index 217c8e11f4..52cdb011a7 100644 --- a/data/styles/clear/style-clear/symbols/australian-football-l.svg +++ b/data/styles/clear/style-clear/symbols/australian-football-l.svg @@ -1,19 +1,7 @@ - - - - australian-football-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/australian-football-m.svg b/data/styles/clear/style-clear/symbols/australian-football-m.svg index 4efdd7f095..f990e1c082 100644 --- a/data/styles/clear/style-clear/symbols/australian-football-m.svg +++ b/data/styles/clear/style-clear/symbols/australian-football-m.svg @@ -1,19 +1,7 @@ - - - - australian-football-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/australian-football-s.svg b/data/styles/clear/style-clear/symbols/australian-football-s.svg index b2f3f2394a..779aa97fdf 100644 --- a/data/styles/clear/style-clear/symbols/australian-football-s.svg +++ b/data/styles/clear/style-clear/symbols/australian-football-s.svg @@ -1,19 +1,7 @@ - - - - australian-football-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bakery-l.svg b/data/styles/clear/style-clear/symbols/bakery-l.svg index 706a53e6d8..dc8d5f824e 100644 --- a/data/styles/clear/style-clear/symbols/bakery-l.svg +++ b/data/styles/clear/style-clear/symbols/bakery-l.svg @@ -1,19 +1,7 @@ - - - - bakery-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bakery-m.svg b/data/styles/clear/style-clear/symbols/bakery-m.svg index 150797211c..479845222a 100644 --- a/data/styles/clear/style-clear/symbols/bakery-m.svg +++ b/data/styles/clear/style-clear/symbols/bakery-m.svg @@ -1,19 +1,7 @@ - - - - bakery-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bakery-s.svg b/data/styles/clear/style-clear/symbols/bakery-s.svg index 4c80854fe1..eee09cbffa 100644 --- a/data/styles/clear/style-clear/symbols/bakery-s.svg +++ b/data/styles/clear/style-clear/symbols/bakery-s.svg @@ -1,19 +1,7 @@ - - - - bakery-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bank-l.svg b/data/styles/clear/style-clear/symbols/bank-l.svg index e040ce0a33..ce066db37a 100644 --- a/data/styles/clear/style-clear/symbols/bank-l.svg +++ b/data/styles/clear/style-clear/symbols/bank-l.svg @@ -1,16 +1,7 @@ - - - - bank-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bank-m.svg b/data/styles/clear/style-clear/symbols/bank-m.svg index a7396db78d..bb1855d173 100644 --- a/data/styles/clear/style-clear/symbols/bank-m.svg +++ b/data/styles/clear/style-clear/symbols/bank-m.svg @@ -1,16 +1,7 @@ - - - - bank-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bank-s.svg b/data/styles/clear/style-clear/symbols/bank-s.svg index bb71b6c940..6876e6c967 100644 --- a/data/styles/clear/style-clear/symbols/bank-s.svg +++ b/data/styles/clear/style-clear/symbols/bank-s.svg @@ -1,16 +1,7 @@ - - - - bank-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/banknote-l.svg b/data/styles/clear/style-clear/symbols/banknote-l.svg index 3f1685647f..640e0abdcd 100644 --- a/data/styles/clear/style-clear/symbols/banknote-l.svg +++ b/data/styles/clear/style-clear/symbols/banknote-l.svg @@ -1,20 +1,7 @@ - - - - banknote-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/banknote-m.svg b/data/styles/clear/style-clear/symbols/banknote-m.svg index 3dcee4b591..083ae07ace 100644 --- a/data/styles/clear/style-clear/symbols/banknote-m.svg +++ b/data/styles/clear/style-clear/symbols/banknote-m.svg @@ -1,28 +1,7 @@ - - - - banknote-m - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/banknote-s.svg b/data/styles/clear/style-clear/symbols/banknote-s.svg new file mode 100644 index 0000000000..03b362f436 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/banknote-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bar-l.svg b/data/styles/clear/style-clear/symbols/bar-l.svg index 27faf7226e..8f00e17334 100644 --- a/data/styles/clear/style-clear/symbols/bar-l.svg +++ b/data/styles/clear/style-clear/symbols/bar-l.svg @@ -1,21 +1,7 @@ - - - - bar-l - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bar-m.svg b/data/styles/clear/style-clear/symbols/bar-m.svg index 1f42384e75..018788ad4d 100644 --- a/data/styles/clear/style-clear/symbols/bar-m.svg +++ b/data/styles/clear/style-clear/symbols/bar-m.svg @@ -1,21 +1,7 @@ - - - - bar-m - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bar-s.svg b/data/styles/clear/style-clear/symbols/bar-s.svg index df47606059..c70b75ba53 100644 --- a/data/styles/clear/style-clear/symbols/bar-s.svg +++ b/data/styles/clear/style-clear/symbols/bar-s.svg @@ -1,21 +1,7 @@ - - - - bar-s - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/baseball-l.svg b/data/styles/clear/style-clear/symbols/baseball-l.svg index 96965b8e60..72c01a8e26 100644 --- a/data/styles/clear/style-clear/symbols/baseball-l.svg +++ b/data/styles/clear/style-clear/symbols/baseball-l.svg @@ -1,19 +1,7 @@ - - - - baseball-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/baseball-m.svg b/data/styles/clear/style-clear/symbols/baseball-m.svg index 6fe03011b5..583e2ec972 100644 --- a/data/styles/clear/style-clear/symbols/baseball-m.svg +++ b/data/styles/clear/style-clear/symbols/baseball-m.svg @@ -1,19 +1,7 @@ - - - - baseball-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/baseball-s.svg b/data/styles/clear/style-clear/symbols/baseball-s.svg index 07206c98ae..4ae2ee2c76 100644 --- a/data/styles/clear/style-clear/symbols/baseball-s.svg +++ b/data/styles/clear/style-clear/symbols/baseball-s.svg @@ -1,19 +1,7 @@ - - - - baseball-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/basketball-l.svg b/data/styles/clear/style-clear/symbols/basketball-l.svg index da7b4b5194..9439abc09c 100644 --- a/data/styles/clear/style-clear/symbols/basketball-l.svg +++ b/data/styles/clear/style-clear/symbols/basketball-l.svg @@ -1,19 +1,7 @@ - - - - basketball-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/basketball-m.svg b/data/styles/clear/style-clear/symbols/basketball-m.svg index 43ab840e40..f1730e92bc 100644 --- a/data/styles/clear/style-clear/symbols/basketball-m.svg +++ b/data/styles/clear/style-clear/symbols/basketball-m.svg @@ -1,19 +1,7 @@ - - - - basketball-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/basketball-s.svg b/data/styles/clear/style-clear/symbols/basketball-s.svg index cda295dcd1..d1fd81602b 100644 --- a/data/styles/clear/style-clear/symbols/basketball-s.svg +++ b/data/styles/clear/style-clear/symbols/basketball-s.svg @@ -1,19 +1,7 @@ - - - - basketball-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bbq-l.svg b/data/styles/clear/style-clear/symbols/bbq-l.svg index e55198798d..6696a4e2d4 100644 --- a/data/styles/clear/style-clear/symbols/bbq-l.svg +++ b/data/styles/clear/style-clear/symbols/bbq-l.svg @@ -1,19 +1,7 @@ - - - - bbq-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bbq-m.svg b/data/styles/clear/style-clear/symbols/bbq-m.svg index 8994fc3dbc..d7f62d9825 100644 --- a/data/styles/clear/style-clear/symbols/bbq-m.svg +++ b/data/styles/clear/style-clear/symbols/bbq-m.svg @@ -1,19 +1,7 @@ - - - - bbq-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bbq-s.svg b/data/styles/clear/style-clear/symbols/bbq-s.svg index 2c8582659b..f756a4c068 100644 --- a/data/styles/clear/style-clear/symbols/bbq-s.svg +++ b/data/styles/clear/style-clear/symbols/bbq-s.svg @@ -1,19 +1,7 @@ - - - - bbq-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bcontrol-l.svg b/data/styles/clear/style-clear/symbols/bcontrol-l.svg index 3edc9bf036..8a726039cc 100644 --- a/data/styles/clear/style-clear/symbols/bcontrol-l.svg +++ b/data/styles/clear/style-clear/symbols/bcontrol-l.svg @@ -1,15 +1,7 @@ - - - - bcontrol-l - Created with Sketch. - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bcontrol-m.svg b/data/styles/clear/style-clear/symbols/bcontrol-m.svg index 6c8b834b93..49f5414030 100644 --- a/data/styles/clear/style-clear/symbols/bcontrol-m.svg +++ b/data/styles/clear/style-clear/symbols/bcontrol-m.svg @@ -1,14 +1,7 @@ - - - - bcontrol-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bcontrol-s.svg b/data/styles/clear/style-clear/symbols/bcontrol-s.svg index 108e9b76c9..b48dd4d2e9 100644 --- a/data/styles/clear/style-clear/symbols/bcontrol-s.svg +++ b/data/styles/clear/style-clear/symbols/bcontrol-s.svg @@ -1,14 +1,7 @@ - - - - bcontrol-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/beach-l.svg b/data/styles/clear/style-clear/symbols/beach-l.svg index 01af1270f1..f25d173c89 100644 --- a/data/styles/clear/style-clear/symbols/beach-l.svg +++ b/data/styles/clear/style-clear/symbols/beach-l.svg @@ -1,19 +1,7 @@ - - - - beach-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/beach-m.svg b/data/styles/clear/style-clear/symbols/beach-m.svg index f520ae7e44..d81c24a136 100644 --- a/data/styles/clear/style-clear/symbols/beach-m.svg +++ b/data/styles/clear/style-clear/symbols/beach-m.svg @@ -1,19 +1,7 @@ - - - - beach-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/beach-s.svg b/data/styles/clear/style-clear/symbols/beach-s.svg index 712742fdbd..a2525042a8 100644 --- a/data/styles/clear/style-clear/symbols/beach-s.svg +++ b/data/styles/clear/style-clear/symbols/beach-s.svg @@ -1,19 +1,7 @@ - - - - beach-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/beauty-l.svg b/data/styles/clear/style-clear/symbols/beauty-l.svg index 37c4a38a73..8d3e1dc550 100644 --- a/data/styles/clear/style-clear/symbols/beauty-l.svg +++ b/data/styles/clear/style-clear/symbols/beauty-l.svg @@ -1,19 +1,7 @@ - - - - beauty-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/beauty-m.svg b/data/styles/clear/style-clear/symbols/beauty-m.svg index 930043c1ff..187b258aa0 100644 --- a/data/styles/clear/style-clear/symbols/beauty-m.svg +++ b/data/styles/clear/style-clear/symbols/beauty-m.svg @@ -1,19 +1,7 @@ - - - - beauty-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/beauty-s.svg b/data/styles/clear/style-clear/symbols/beauty-s.svg index 0033752f6b..721f3c9992 100644 --- a/data/styles/clear/style-clear/symbols/beauty-s.svg +++ b/data/styles/clear/style-clear/symbols/beauty-s.svg @@ -1,19 +1,7 @@ - - - - beauty-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/beer-l.svg b/data/styles/clear/style-clear/symbols/beer-l.svg index 75ed5e4286..cdb83f7ad2 100644 --- a/data/styles/clear/style-clear/symbols/beer-l.svg +++ b/data/styles/clear/style-clear/symbols/beer-l.svg @@ -1,25 +1,7 @@ - - - - beer-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/beer-m.svg b/data/styles/clear/style-clear/symbols/beer-m.svg index 75f6674c79..529f544a3f 100644 --- a/data/styles/clear/style-clear/symbols/beer-m.svg +++ b/data/styles/clear/style-clear/symbols/beer-m.svg @@ -1,25 +1,7 @@ - - - - beer-m - Created with Sketch. - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/beer-s.svg b/data/styles/clear/style-clear/symbols/beer-s.svg index d5c4592df3..4e9d734b60 100644 --- a/data/styles/clear/style-clear/symbols/beer-s.svg +++ b/data/styles/clear/style-clear/symbols/beer-s.svg @@ -1,21 +1,7 @@ - - - - beer-s - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bench.svg b/data/styles/clear/style-clear/symbols/bench.svg index 2175269f9f..2a5089d24c 100644 --- a/data/styles/clear/style-clear/symbols/bench.svg +++ b/data/styles/clear/style-clear/symbols/bench.svg @@ -1,12 +1,3 @@ - - - - bench - Created with Sketch. - - - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-clear/symbols/bicycle-l.svg b/data/styles/clear/style-clear/symbols/bicycle-l.svg index 93ef8fc141..66c4094187 100644 --- a/data/styles/clear/style-clear/symbols/bicycle-l.svg +++ b/data/styles/clear/style-clear/symbols/bicycle-l.svg @@ -1,19 +1,7 @@ - - - - bicycle-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bicycle-m.svg b/data/styles/clear/style-clear/symbols/bicycle-m.svg index 529663cf2f..0bb17aca35 100644 --- a/data/styles/clear/style-clear/symbols/bicycle-m.svg +++ b/data/styles/clear/style-clear/symbols/bicycle-m.svg @@ -1,21 +1,7 @@ - - - - bicycle-m - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bicycle-s.svg b/data/styles/clear/style-clear/symbols/bicycle-s.svg index c0d2320b43..68ec53e0c2 100644 --- a/data/styles/clear/style-clear/symbols/bicycle-s.svg +++ b/data/styles/clear/style-clear/symbols/bicycle-s.svg @@ -1,19 +1,7 @@ - - - - bicycle-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bike-parking-l.svg b/data/styles/clear/style-clear/symbols/bike-parking-l.svg index 120bc05b9c..6ffebabc20 100644 --- a/data/styles/clear/style-clear/symbols/bike-parking-l.svg +++ b/data/styles/clear/style-clear/symbols/bike-parking-l.svg @@ -1,23 +1,7 @@ - - - - bike-parking-l - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bike-parking-m.svg b/data/styles/clear/style-clear/symbols/bike-parking-m.svg index b7e818e9e9..796f4587ed 100644 --- a/data/styles/clear/style-clear/symbols/bike-parking-m.svg +++ b/data/styles/clear/style-clear/symbols/bike-parking-m.svg @@ -1,8 +1,7 @@ - - - - bike-parking-m - Created with Sketch. - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bike-parking-s.svg b/data/styles/clear/style-clear/symbols/bike-parking-s.svg index 57714d4131..79c8bb3a07 100644 --- a/data/styles/clear/style-clear/symbols/bike-parking-s.svg +++ b/data/styles/clear/style-clear/symbols/bike-parking-s.svg @@ -1,8 +1,7 @@ - - - - bike-parking-s - Created with Sketch. - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/book-shop-l.svg b/data/styles/clear/style-clear/symbols/book-shop-l.svg index 97049aa52e..0ead4a8426 100644 --- a/data/styles/clear/style-clear/symbols/book-shop-l.svg +++ b/data/styles/clear/style-clear/symbols/book-shop-l.svg @@ -1,19 +1,7 @@ - - - - book-shop-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/book-shop-m.svg b/data/styles/clear/style-clear/symbols/book-shop-m.svg index 2424271726..1fab15d60f 100644 --- a/data/styles/clear/style-clear/symbols/book-shop-m.svg +++ b/data/styles/clear/style-clear/symbols/book-shop-m.svg @@ -1,19 +1,7 @@ - - - - book-shop-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/book-shop-s.svg b/data/styles/clear/style-clear/symbols/book-shop-s.svg index 078f19f9de..397d41d5b7 100644 --- a/data/styles/clear/style-clear/symbols/book-shop-s.svg +++ b/data/styles/clear/style-clear/symbols/book-shop-s.svg @@ -1,19 +1,7 @@ - - - - book-shop-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bookmaker-l.svg b/data/styles/clear/style-clear/symbols/bookmaker-l.svg index 5e9e06ba7f..f3f3d4c925 100644 --- a/data/styles/clear/style-clear/symbols/bookmaker-l.svg +++ b/data/styles/clear/style-clear/symbols/bookmaker-l.svg @@ -1,33 +1,7 @@ - - - - bookmaker-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bookmaker-m.svg b/data/styles/clear/style-clear/symbols/bookmaker-m.svg index 51b96b8dde..d23d1b800e 100644 --- a/data/styles/clear/style-clear/symbols/bookmaker-m.svg +++ b/data/styles/clear/style-clear/symbols/bookmaker-m.svg @@ -1,21 +1,7 @@ - - - - bookmaker-m - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bookmaker-s.svg b/data/styles/clear/style-clear/symbols/bookmaker-s.svg new file mode 100644 index 0000000000..0ffa316d96 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/bookmaker-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bowls-l.svg b/data/styles/clear/style-clear/symbols/bowls-l.svg index 9b18ccd797..6f427a86e6 100644 --- a/data/styles/clear/style-clear/symbols/bowls-l.svg +++ b/data/styles/clear/style-clear/symbols/bowls-l.svg @@ -1,19 +1,7 @@ - - - - bowls-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bowls-m.svg b/data/styles/clear/style-clear/symbols/bowls-m.svg index 0c41731646..799f019f7a 100644 --- a/data/styles/clear/style-clear/symbols/bowls-m.svg +++ b/data/styles/clear/style-clear/symbols/bowls-m.svg @@ -1,19 +1,7 @@ - - - - bowls-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bowls-s.svg b/data/styles/clear/style-clear/symbols/bowls-s.svg index ff0b357a40..a252c9a951 100644 --- a/data/styles/clear/style-clear/symbols/bowls-s.svg +++ b/data/styles/clear/style-clear/symbols/bowls-s.svg @@ -1,19 +1,7 @@ - - - - bowls-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/buddhist-l.svg b/data/styles/clear/style-clear/symbols/buddhist-l.svg index 84f8f5ed1e..89ccdc02c6 100644 --- a/data/styles/clear/style-clear/symbols/buddhist-l.svg +++ b/data/styles/clear/style-clear/symbols/buddhist-l.svg @@ -1,16 +1,8 @@ - - - - buddhist-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/buddhist-m.svg b/data/styles/clear/style-clear/symbols/buddhist-m.svg index 6897cb6529..0505e7ddd1 100644 --- a/data/styles/clear/style-clear/symbols/buddhist-m.svg +++ b/data/styles/clear/style-clear/symbols/buddhist-m.svg @@ -1,16 +1,7 @@ - - - - buddhist-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/buddhist-s.svg b/data/styles/clear/style-clear/symbols/buddhist-s.svg index e3be2a4976..75d8782d15 100644 --- a/data/styles/clear/style-clear/symbols/buddhist-s.svg +++ b/data/styles/clear/style-clear/symbols/buddhist-s.svg @@ -1,16 +1,7 @@ - - - - buddhist-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bus-l.svg b/data/styles/clear/style-clear/symbols/bus-l.svg index 07fde005c9..1822cf94e3 100644 --- a/data/styles/clear/style-clear/symbols/bus-l.svg +++ b/data/styles/clear/style-clear/symbols/bus-l.svg @@ -1,23 +1,7 @@ - - - - bus-l - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bus-m.svg b/data/styles/clear/style-clear/symbols/bus-m.svg index e23a33a053..7b624e4bdf 100644 --- a/data/styles/clear/style-clear/symbols/bus-m.svg +++ b/data/styles/clear/style-clear/symbols/bus-m.svg @@ -1,23 +1,7 @@ - - - - bus-m - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/bus-s.svg b/data/styles/clear/style-clear/symbols/bus-s.svg index b881870ff7..b79445b69a 100644 --- a/data/styles/clear/style-clear/symbols/bus-s.svg +++ b/data/styles/clear/style-clear/symbols/bus-s.svg @@ -1,23 +1,7 @@ - - - - bus-s - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/butcher-l.svg b/data/styles/clear/style-clear/symbols/butcher-l.svg index ebdbf7a61d..4d51f941a5 100644 --- a/data/styles/clear/style-clear/symbols/butcher-l.svg +++ b/data/styles/clear/style-clear/symbols/butcher-l.svg @@ -1,19 +1,7 @@ - - - - butcher-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/butcher-m.svg b/data/styles/clear/style-clear/symbols/butcher-m.svg index 3d9e28cded..ec692a0344 100644 --- a/data/styles/clear/style-clear/symbols/butcher-m.svg +++ b/data/styles/clear/style-clear/symbols/butcher-m.svg @@ -1,19 +1,7 @@ - - - - butcher-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/butcher-s.svg b/data/styles/clear/style-clear/symbols/butcher-s.svg index 78a1a19e92..d5286a67ed 100644 --- a/data/styles/clear/style-clear/symbols/butcher-s.svg +++ b/data/styles/clear/style-clear/symbols/butcher-s.svg @@ -1,19 +1,7 @@ - - - - butcher-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/cable-car-l.svg b/data/styles/clear/style-clear/symbols/cable-car-l.svg index 2f19ee610a..d61860ed20 100644 --- a/data/styles/clear/style-clear/symbols/cable-car-l.svg +++ b/data/styles/clear/style-clear/symbols/cable-car-l.svg @@ -1,24 +1,7 @@ - - - - cable-car-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/cable-car-m.svg b/data/styles/clear/style-clear/symbols/cable-car-m.svg index 73aa0908bb..7081e9d4b0 100644 --- a/data/styles/clear/style-clear/symbols/cable-car-m.svg +++ b/data/styles/clear/style-clear/symbols/cable-car-m.svg @@ -1,26 +1,7 @@ - - - - cable-car-m - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/cable-car-s.svg b/data/styles/clear/style-clear/symbols/cable-car-s.svg index f079b6a837..9e99cb6c81 100644 --- a/data/styles/clear/style-clear/symbols/cable-car-s.svg +++ b/data/styles/clear/style-clear/symbols/cable-car-s.svg @@ -1,25 +1,7 @@ - - - - cable-car-s - Created with Sketch. - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/cafe-l.svg b/data/styles/clear/style-clear/symbols/cafe-l.svg index dac10e9bdb..63d12f54ad 100644 --- a/data/styles/clear/style-clear/symbols/cafe-l.svg +++ b/data/styles/clear/style-clear/symbols/cafe-l.svg @@ -1,21 +1,7 @@ - - - - cafe-l - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/cafe-m.svg b/data/styles/clear/style-clear/symbols/cafe-m.svg index 26f4fab1e5..590eaf21c4 100644 --- a/data/styles/clear/style-clear/symbols/cafe-m.svg +++ b/data/styles/clear/style-clear/symbols/cafe-m.svg @@ -1,21 +1,7 @@ - - - - cafe-m - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/cafe-s.svg b/data/styles/clear/style-clear/symbols/cafe-s.svg index 4bd6b6d6f9..96ec91e88f 100644 --- a/data/styles/clear/style-clear/symbols/cafe-s.svg +++ b/data/styles/clear/style-clear/symbols/cafe-s.svg @@ -1,21 +1,7 @@ - - - - cafe-s - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/campsite-l.svg b/data/styles/clear/style-clear/symbols/campsite-l.svg index 58f58af7bf..62e7556792 100644 --- a/data/styles/clear/style-clear/symbols/campsite-l.svg +++ b/data/styles/clear/style-clear/symbols/campsite-l.svg @@ -1,19 +1,7 @@ - - - - campsite-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/campsite-m.svg b/data/styles/clear/style-clear/symbols/campsite-m.svg index ddf1b2aefa..51db981cce 100644 --- a/data/styles/clear/style-clear/symbols/campsite-m.svg +++ b/data/styles/clear/style-clear/symbols/campsite-m.svg @@ -1,19 +1,7 @@ - - - - campsite-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/campsite-s.svg b/data/styles/clear/style-clear/symbols/campsite-s.svg index 68d490bafd..c1e024d3f8 100644 --- a/data/styles/clear/style-clear/symbols/campsite-s.svg +++ b/data/styles/clear/style-clear/symbols/campsite-s.svg @@ -1,19 +1,7 @@ - - - - campsite-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/car-part-l.svg b/data/styles/clear/style-clear/symbols/car-part-l.svg index 1b1ff5c0db..90eb9a3143 100644 --- a/data/styles/clear/style-clear/symbols/car-part-l.svg +++ b/data/styles/clear/style-clear/symbols/car-part-l.svg @@ -1,36 +1,7 @@ - - - - car-part-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/car-part-m.svg b/data/styles/clear/style-clear/symbols/car-part-m.svg index 1aea1de9e0..3c3b1c2b4e 100644 --- a/data/styles/clear/style-clear/symbols/car-part-m.svg +++ b/data/styles/clear/style-clear/symbols/car-part-m.svg @@ -1,21 +1,7 @@ - - - - car-part-m - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/car-part-s.svg b/data/styles/clear/style-clear/symbols/car-part-s.svg index bf2f7995cf..cc0aeff130 100644 --- a/data/styles/clear/style-clear/symbols/car-part-s.svg +++ b/data/styles/clear/style-clear/symbols/car-part-s.svg @@ -1,21 +1,7 @@ - - - - car-part-s - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/car-repair-l.svg b/data/styles/clear/style-clear/symbols/car-repair-l.svg index 8adaa5c581..f9c2c847b6 100644 --- a/data/styles/clear/style-clear/symbols/car-repair-l.svg +++ b/data/styles/clear/style-clear/symbols/car-repair-l.svg @@ -1,25 +1,7 @@ - - - - car-repair-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/car-repair-m.svg b/data/styles/clear/style-clear/symbols/car-repair-m.svg index faa3b15e50..387b0feb13 100644 --- a/data/styles/clear/style-clear/symbols/car-repair-m.svg +++ b/data/styles/clear/style-clear/symbols/car-repair-m.svg @@ -1,25 +1,7 @@ - - - - car-repair-m - Created with Sketch. - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/car-repair-s.svg b/data/styles/clear/style-clear/symbols/car-repair-s.svg index afe97bf153..dc13229e24 100644 --- a/data/styles/clear/style-clear/symbols/car-repair-s.svg +++ b/data/styles/clear/style-clear/symbols/car-repair-s.svg @@ -1,21 +1,7 @@ - - - - car-repair-s - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/car-wash-l.svg b/data/styles/clear/style-clear/symbols/car-wash-l.svg index 2edc040e4e..644e6366dd 100644 --- a/data/styles/clear/style-clear/symbols/car-wash-l.svg +++ b/data/styles/clear/style-clear/symbols/car-wash-l.svg @@ -1,38 +1,7 @@ - - - - car-wash-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/car-wash-m.svg b/data/styles/clear/style-clear/symbols/car-wash-m.svg index adf93db86d..31485f1458 100644 --- a/data/styles/clear/style-clear/symbols/car-wash-m.svg +++ b/data/styles/clear/style-clear/symbols/car-wash-m.svg @@ -1,24 +1,7 @@ - - - - car-wash-m - Created with Sketch. - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/car-wash-s.svg b/data/styles/clear/style-clear/symbols/car-wash-s.svg index b33a11989c..7fe4c3769a 100644 --- a/data/styles/clear/style-clear/symbols/car-wash-s.svg +++ b/data/styles/clear/style-clear/symbols/car-wash-s.svg @@ -1,24 +1,7 @@ - - - - car-wash-s - Created with Sketch. - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/car_sharing-l.svg b/data/styles/clear/style-clear/symbols/car_sharing-l.svg index 96e260586d..a7f621dba0 100644 --- a/data/styles/clear/style-clear/symbols/car_sharing-l.svg +++ b/data/styles/clear/style-clear/symbols/car_sharing-l.svg @@ -1,36 +1,7 @@ - - - - car_sharing-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/car_sharing-m.svg b/data/styles/clear/style-clear/symbols/car_sharing-m.svg index ee46b731f8..a4383dd752 100644 --- a/data/styles/clear/style-clear/symbols/car_sharing-m.svg +++ b/data/styles/clear/style-clear/symbols/car_sharing-m.svg @@ -1,26 +1,7 @@ - - - - car_sharing-m - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/car_sharing-s.svg b/data/styles/clear/style-clear/symbols/car_sharing-s.svg index a32614240c..fbb26ebaa9 100644 --- a/data/styles/clear/style-clear/symbols/car_sharing-s.svg +++ b/data/styles/clear/style-clear/symbols/car_sharing-s.svg @@ -1,21 +1,7 @@ - - - - car_sharing-s - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/car_shop-l.svg b/data/styles/clear/style-clear/symbols/car_shop-l.svg index abc543a33f..ac96878562 100644 --- a/data/styles/clear/style-clear/symbols/car_shop-l.svg +++ b/data/styles/clear/style-clear/symbols/car_shop-l.svg @@ -1,23 +1,7 @@ - - - - car_shop-l - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/car_shop-m.svg b/data/styles/clear/style-clear/symbols/car_shop-m.svg index 13b94d9eef..351eb22879 100644 --- a/data/styles/clear/style-clear/symbols/car_shop-m.svg +++ b/data/styles/clear/style-clear/symbols/car_shop-m.svg @@ -1,23 +1,7 @@ - - - - car_shop-m - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/car_shop-s.svg b/data/styles/clear/style-clear/symbols/car_shop-s.svg index ba314e2f48..e738f85db1 100644 --- a/data/styles/clear/style-clear/symbols/car_shop-s.svg +++ b/data/styles/clear/style-clear/symbols/car_shop-s.svg @@ -1,23 +1,7 @@ - - - - car_shop-s - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/caravan_site-l.svg b/data/styles/clear/style-clear/symbols/caravan_site-l.svg index ab49660dfa..502a820061 100644 --- a/data/styles/clear/style-clear/symbols/caravan_site-l.svg +++ b/data/styles/clear/style-clear/symbols/caravan_site-l.svg @@ -1,14 +1,7 @@ - - - - caravan_site-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/caravan_site-m.svg b/data/styles/clear/style-clear/symbols/caravan_site-m.svg index 9fa3ea2eab..e94c5e83b0 100644 --- a/data/styles/clear/style-clear/symbols/caravan_site-m.svg +++ b/data/styles/clear/style-clear/symbols/caravan_site-m.svg @@ -1,14 +1,7 @@ - - - - caravan_site-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/caravan_site-s.svg b/data/styles/clear/style-clear/symbols/caravan_site-s.svg index 46c265184c..afb40d3504 100644 --- a/data/styles/clear/style-clear/symbols/caravan_site-s.svg +++ b/data/styles/clear/style-clear/symbols/caravan_site-s.svg @@ -1,14 +1,7 @@ - - - - caravan_site-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/casino-l.svg b/data/styles/clear/style-clear/symbols/casino-l.svg index faafefc19c..aa3ff8d861 100644 --- a/data/styles/clear/style-clear/symbols/casino-l.svg +++ b/data/styles/clear/style-clear/symbols/casino-l.svg @@ -1,14 +1,7 @@ - - - - casino-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/casino-m.svg b/data/styles/clear/style-clear/symbols/casino-m.svg index aad6870445..03e97e6ac5 100644 --- a/data/styles/clear/style-clear/symbols/casino-m.svg +++ b/data/styles/clear/style-clear/symbols/casino-m.svg @@ -1,14 +1,7 @@ - - - - casino-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/casino-s.svg b/data/styles/clear/style-clear/symbols/casino-s.svg index c56e234c34..34f839af2f 100644 --- a/data/styles/clear/style-clear/symbols/casino-s.svg +++ b/data/styles/clear/style-clear/symbols/casino-s.svg @@ -1,14 +1,7 @@ - - - - casino-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/cave-l.svg b/data/styles/clear/style-clear/symbols/cave-l.svg index e0ac23c4f2..0d5f7c622d 100644 --- a/data/styles/clear/style-clear/symbols/cave-l.svg +++ b/data/styles/clear/style-clear/symbols/cave-l.svg @@ -1,13 +1,3 @@ - - - - cave-l - Created with Sketch. - - - - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-clear/symbols/cave-m.svg b/data/styles/clear/style-clear/symbols/cave-m.svg index aa831cac74..36eeddc13c 100644 --- a/data/styles/clear/style-clear/symbols/cave-m.svg +++ b/data/styles/clear/style-clear/symbols/cave-m.svg @@ -1,12 +1,3 @@ - - - - cave-m - Created with Sketch. - - - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-clear/symbols/cave-s.svg b/data/styles/clear/style-clear/symbols/cave-s.svg index 7b024f8056..a4cef9cdc2 100644 --- a/data/styles/clear/style-clear/symbols/cave-s.svg +++ b/data/styles/clear/style-clear/symbols/cave-s.svg @@ -1,12 +1,3 @@ - - - - cave-s - Created with Sketch. - - - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-clear/symbols/cemetery-l.svg b/data/styles/clear/style-clear/symbols/cemetery-l.svg index 745c14812a..e08c1896f5 100644 --- a/data/styles/clear/style-clear/symbols/cemetery-l.svg +++ b/data/styles/clear/style-clear/symbols/cemetery-l.svg @@ -1,19 +1,7 @@ - - - - cemetery-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/cemetery-m.svg b/data/styles/clear/style-clear/symbols/cemetery-m.svg index a4cbdcf853..97bdccb12e 100644 --- a/data/styles/clear/style-clear/symbols/cemetery-m.svg +++ b/data/styles/clear/style-clear/symbols/cemetery-m.svg @@ -1,19 +1,7 @@ - - - - cemetery-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/cemetery-s.svg b/data/styles/clear/style-clear/symbols/cemetery-s.svg index 35cae5cf1d..2d5f0bb1dd 100644 --- a/data/styles/clear/style-clear/symbols/cemetery-s.svg +++ b/data/styles/clear/style-clear/symbols/cemetery-s.svg @@ -1,19 +1,7 @@ - - - - cemetery-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/charging-station-l.svg b/data/styles/clear/style-clear/symbols/charging-station-l.svg index 759f47fff6..87fdd0ba5b 100644 --- a/data/styles/clear/style-clear/symbols/charging-station-l.svg +++ b/data/styles/clear/style-clear/symbols/charging-station-l.svg @@ -1,22 +1,7 @@ - - - - charging-station-l - Created with Sketch. - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/charging-station-m.svg b/data/styles/clear/style-clear/symbols/charging-station-m.svg index 4ff577076c..83c6c286c2 100644 --- a/data/styles/clear/style-clear/symbols/charging-station-m.svg +++ b/data/styles/clear/style-clear/symbols/charging-station-m.svg @@ -1,16 +1,7 @@ - - - - charging-station-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/charging-station-s.svg b/data/styles/clear/style-clear/symbols/charging-station-s.svg index 04b9c0339b..85f6c21c19 100644 --- a/data/styles/clear/style-clear/symbols/charging-station-s.svg +++ b/data/styles/clear/style-clear/symbols/charging-station-s.svg @@ -1,16 +1,7 @@ - - - - charging-station-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/chemist-l.svg b/data/styles/clear/style-clear/symbols/chemist-l.svg index cf3af7a400..d4ba6f944f 100644 --- a/data/styles/clear/style-clear/symbols/chemist-l.svg +++ b/data/styles/clear/style-clear/symbols/chemist-l.svg @@ -1,19 +1,7 @@ - - - - chemist-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/chemist-m.svg b/data/styles/clear/style-clear/symbols/chemist-m.svg index 64dbae87b1..5ad4507bc5 100644 --- a/data/styles/clear/style-clear/symbols/chemist-m.svg +++ b/data/styles/clear/style-clear/symbols/chemist-m.svg @@ -1,19 +1,7 @@ - - - - chemist-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/chemist-s.svg b/data/styles/clear/style-clear/symbols/chemist-s.svg index d061fd5663..84bcfa2bad 100644 --- a/data/styles/clear/style-clear/symbols/chemist-s.svg +++ b/data/styles/clear/style-clear/symbols/chemist-s.svg @@ -1,19 +1,7 @@ - - - - chemist-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/chimney-l.svg b/data/styles/clear/style-clear/symbols/chimney-l.svg index 9801dda244..7a3fcafbd5 100644 --- a/data/styles/clear/style-clear/symbols/chimney-l.svg +++ b/data/styles/clear/style-clear/symbols/chimney-l.svg @@ -1,18 +1,6 @@ - - - - chimney-l - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/chimney-m.svg b/data/styles/clear/style-clear/symbols/chimney-m.svg index ab80b0359f..0d48f741ac 100644 --- a/data/styles/clear/style-clear/symbols/chimney-m.svg +++ b/data/styles/clear/style-clear/symbols/chimney-m.svg @@ -1,18 +1,6 @@ - - - - chimney-m - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/chimney-s.svg b/data/styles/clear/style-clear/symbols/chimney-s.svg new file mode 100644 index 0000000000..7c52d6c31e --- /dev/null +++ b/data/styles/clear/style-clear/symbols/chimney-s.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/data/styles/clear/style-clear/symbols/christian-l.svg b/data/styles/clear/style-clear/symbols/christian-l.svg index c04f88202d..24c8c076be 100644 --- a/data/styles/clear/style-clear/symbols/christian-l.svg +++ b/data/styles/clear/style-clear/symbols/christian-l.svg @@ -1,16 +1,7 @@ - - - - christian-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/christian-m.svg b/data/styles/clear/style-clear/symbols/christian-m.svg index 4d9ec4d350..0de7f048a9 100644 --- a/data/styles/clear/style-clear/symbols/christian-m.svg +++ b/data/styles/clear/style-clear/symbols/christian-m.svg @@ -1,17 +1,7 @@ - - - - christian-m - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/christian-s.svg b/data/styles/clear/style-clear/symbols/christian-s.svg index d5c4af8d4b..78b1a3e8cf 100644 --- a/data/styles/clear/style-clear/symbols/christian-s.svg +++ b/data/styles/clear/style-clear/symbols/christian-s.svg @@ -1,17 +1,7 @@ - - - - christian-s - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/cinema-l.svg b/data/styles/clear/style-clear/symbols/cinema-l.svg index 141664e2c6..abab98839b 100644 --- a/data/styles/clear/style-clear/symbols/cinema-l.svg +++ b/data/styles/clear/style-clear/symbols/cinema-l.svg @@ -1,14 +1,7 @@ - - - - cinema-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/cinema-m.svg b/data/styles/clear/style-clear/symbols/cinema-m.svg index 4c0eca2671..cd89c2136c 100644 --- a/data/styles/clear/style-clear/symbols/cinema-m.svg +++ b/data/styles/clear/style-clear/symbols/cinema-m.svg @@ -1,14 +1,7 @@ - - - - cinema-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/cinema-s.svg b/data/styles/clear/style-clear/symbols/cinema-s.svg index 8cbf9a7ad5..02938e1665 100644 --- a/data/styles/clear/style-clear/symbols/cinema-s.svg +++ b/data/styles/clear/style-clear/symbols/cinema-s.svg @@ -1,14 +1,7 @@ - - - - cinema-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/cities-m.svg b/data/styles/clear/style-clear/symbols/cities-m.svg new file mode 100644 index 0000000000..bc86782c5e --- /dev/null +++ b/data/styles/clear/style-clear/symbols/cities-m.svg @@ -0,0 +1,3 @@ + + + diff --git a/data/styles/clear/style-clear/symbols/cities-s.svg b/data/styles/clear/style-clear/symbols/cities-s.svg new file mode 100644 index 0000000000..dca72e291f --- /dev/null +++ b/data/styles/clear/style-clear/symbols/cities-s.svg @@ -0,0 +1,3 @@ + + + diff --git a/data/styles/clear/style-clear/symbols/cities-xs.svg b/data/styles/clear/style-clear/symbols/cities-xs.svg new file mode 100644 index 0000000000..39b65a8626 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/cities-xs.svg @@ -0,0 +1,3 @@ + + + diff --git a/data/styles/clear/style-clear/symbols/climbing-l.svg b/data/styles/clear/style-clear/symbols/climbing-l.svg index 2259abee39..7102452e63 100644 --- a/data/styles/clear/style-clear/symbols/climbing-l.svg +++ b/data/styles/clear/style-clear/symbols/climbing-l.svg @@ -1,25 +1,7 @@ - - - - climbing-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/climbing-m.svg b/data/styles/clear/style-clear/symbols/climbing-m.svg index 2e64e0b31f..23a28d29e0 100644 --- a/data/styles/clear/style-clear/symbols/climbing-m.svg +++ b/data/styles/clear/style-clear/symbols/climbing-m.svg @@ -1,15 +1,7 @@ - - - - climbing-l.svg - Created with Sketch. - - - - - - - - - + + + + + + diff --git a/data/styles/clear/style-clear/symbols/climbing-s.svg b/data/styles/clear/style-clear/symbols/climbing-s.svg index 39781bd337..9a47d979d7 100644 --- a/data/styles/clear/style-clear/symbols/climbing-s.svg +++ b/data/styles/clear/style-clear/symbols/climbing-s.svg @@ -1,15 +1,7 @@ - - - - climbing-l.svg - Created with Sketch. - - - - - - - - - + + + + + + diff --git a/data/styles/clear/style-clear/symbols/clothes-l.svg b/data/styles/clear/style-clear/symbols/clothes-l.svg index b7e191a813..113c989ee5 100644 --- a/data/styles/clear/style-clear/symbols/clothes-l.svg +++ b/data/styles/clear/style-clear/symbols/clothes-l.svg @@ -1,19 +1,7 @@ - - - - clothes-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/clothes-m.svg b/data/styles/clear/style-clear/symbols/clothes-m.svg index 1fd71debe6..93fea4bf60 100644 --- a/data/styles/clear/style-clear/symbols/clothes-m.svg +++ b/data/styles/clear/style-clear/symbols/clothes-m.svg @@ -1,19 +1,7 @@ - - - - clothes-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/clothes-s.svg b/data/styles/clear/style-clear/symbols/clothes-s.svg index ad9e939576..5e10d4e15a 100644 --- a/data/styles/clear/style-clear/symbols/clothes-s.svg +++ b/data/styles/clear/style-clear/symbols/clothes-s.svg @@ -1,19 +1,7 @@ - - - - clothes-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/college-l.svg b/data/styles/clear/style-clear/symbols/college-l.svg index 003b1bcd4e..e1d6ac3760 100644 --- a/data/styles/clear/style-clear/symbols/college-l.svg +++ b/data/styles/clear/style-clear/symbols/college-l.svg @@ -1,19 +1,7 @@ - - - - college-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/college-m.svg b/data/styles/clear/style-clear/symbols/college-m.svg index 898c5bbe25..39ffa68c1a 100644 --- a/data/styles/clear/style-clear/symbols/college-m.svg +++ b/data/styles/clear/style-clear/symbols/college-m.svg @@ -1,19 +1,7 @@ - - - - college-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/college-s.svg b/data/styles/clear/style-clear/symbols/college-s.svg index 0cc2e9e963..6516d22a9e 100644 --- a/data/styles/clear/style-clear/symbols/college-s.svg +++ b/data/styles/clear/style-clear/symbols/college-s.svg @@ -1,19 +1,7 @@ - - - - college-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/color_test2.sketch b/data/styles/clear/style-clear/symbols/color_test2.sketch deleted file mode 100644 index 427022690a..0000000000 Binary files a/data/styles/clear/style-clear/symbols/color_test2.sketch and /dev/null differ diff --git a/data/styles/clear/style-clear/symbols/computer-l.svg b/data/styles/clear/style-clear/symbols/computer-l.svg index 737cb1f2f4..08aa06e47d 100644 --- a/data/styles/clear/style-clear/symbols/computer-l.svg +++ b/data/styles/clear/style-clear/symbols/computer-l.svg @@ -1,19 +1,7 @@ - - - - computer-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/computer-m.svg b/data/styles/clear/style-clear/symbols/computer-m.svg index 2a55612069..50c0cd6bd6 100644 --- a/data/styles/clear/style-clear/symbols/computer-m.svg +++ b/data/styles/clear/style-clear/symbols/computer-m.svg @@ -1,19 +1,7 @@ - - - - computer-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/computer-s.svg b/data/styles/clear/style-clear/symbols/computer-s.svg index 9978d89691..e5df98413d 100644 --- a/data/styles/clear/style-clear/symbols/computer-s.svg +++ b/data/styles/clear/style-clear/symbols/computer-s.svg @@ -1,19 +1,7 @@ - - - - computer-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/convenience-l.svg b/data/styles/clear/style-clear/symbols/convenience-l.svg index f1a72ceca5..f9678bb1a7 100644 --- a/data/styles/clear/style-clear/symbols/convenience-l.svg +++ b/data/styles/clear/style-clear/symbols/convenience-l.svg @@ -1,19 +1,7 @@ - - - - convenience-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/convenience-m.svg b/data/styles/clear/style-clear/symbols/convenience-m.svg index f51bd41908..27b0956aad 100644 --- a/data/styles/clear/style-clear/symbols/convenience-m.svg +++ b/data/styles/clear/style-clear/symbols/convenience-m.svg @@ -1,19 +1,7 @@ - - - - convenience-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/convenience-s.svg b/data/styles/clear/style-clear/symbols/convenience-s.svg index 5046ba012e..d8fb6ae29f 100644 --- a/data/styles/clear/style-clear/symbols/convenience-s.svg +++ b/data/styles/clear/style-clear/symbols/convenience-s.svg @@ -1,19 +1,7 @@ - - - - convenience-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/copyshop-l.svg b/data/styles/clear/style-clear/symbols/copyshop-l.svg index 2fa3fbf8d2..1d3b69beb3 100644 --- a/data/styles/clear/style-clear/symbols/copyshop-l.svg +++ b/data/styles/clear/style-clear/symbols/copyshop-l.svg @@ -1,25 +1,7 @@ - - - - copyshop-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/copyshop-m.svg b/data/styles/clear/style-clear/symbols/copyshop-m.svg index fdf47cf8b6..94f052f6e6 100644 --- a/data/styles/clear/style-clear/symbols/copyshop-m.svg +++ b/data/styles/clear/style-clear/symbols/copyshop-m.svg @@ -1,25 +1,7 @@ - - - - copyshop-m - Created with Sketch. - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/copyshop-s.svg b/data/styles/clear/style-clear/symbols/copyshop-s.svg new file mode 100644 index 0000000000..dc2dfa21ec --- /dev/null +++ b/data/styles/clear/style-clear/symbols/copyshop-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/cricket-l.svg b/data/styles/clear/style-clear/symbols/cricket-l.svg index 3fef57372e..44544793e8 100644 --- a/data/styles/clear/style-clear/symbols/cricket-l.svg +++ b/data/styles/clear/style-clear/symbols/cricket-l.svg @@ -1,19 +1,7 @@ - - - - cricket-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/cricket-m.svg b/data/styles/clear/style-clear/symbols/cricket-m.svg index aa8eef7fb3..aa9d3c1596 100644 --- a/data/styles/clear/style-clear/symbols/cricket-m.svg +++ b/data/styles/clear/style-clear/symbols/cricket-m.svg @@ -1,19 +1,7 @@ - - - - cricket-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/cricket-s.svg b/data/styles/clear/style-clear/symbols/cricket-s.svg index 17a964233a..fac41e9ecd 100644 --- a/data/styles/clear/style-clear/symbols/cricket-s.svg +++ b/data/styles/clear/style-clear/symbols/cricket-s.svg @@ -1,19 +1,7 @@ - - - - cricket-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/crossing-l.svg b/data/styles/clear/style-clear/symbols/crossing-l.svg index d2d80153cc..7920db783e 100644 --- a/data/styles/clear/style-clear/symbols/crossing-l.svg +++ b/data/styles/clear/style-clear/symbols/crossing-l.svg @@ -1,15 +1,9 @@ - - - - crossing-l - Created with Sketch. - - - - - - - - - - \ No newline at end of file + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/crossing-m.svg b/data/styles/clear/style-clear/symbols/crossing-m.svg index 8827f3a55e..d717b36e5d 100644 --- a/data/styles/clear/style-clear/symbols/crossing-m.svg +++ b/data/styles/clear/style-clear/symbols/crossing-m.svg @@ -1,15 +1,9 @@ - - - - crossing-m - Created with Sketch. - - - - - - - - - - \ No newline at end of file + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/crossing-s.svg b/data/styles/clear/style-clear/symbols/crossing-s.svg index 0fbf03c51f..04075c7b0c 100644 --- a/data/styles/clear/style-clear/symbols/crossing-s.svg +++ b/data/styles/clear/style-clear/symbols/crossing-s.svg @@ -1,15 +1,9 @@ - - - - crossing-s - Created with Sketch. - - - - - - - - - - \ No newline at end of file + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/curling-l.svg b/data/styles/clear/style-clear/symbols/curling-l.svg index 0b87180f44..6b6630e6cd 100644 --- a/data/styles/clear/style-clear/symbols/curling-l.svg +++ b/data/styles/clear/style-clear/symbols/curling-l.svg @@ -1,19 +1,7 @@ - - - - curling-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/curling-m.svg b/data/styles/clear/style-clear/symbols/curling-m.svg index c7678f313a..5f752a3f07 100644 --- a/data/styles/clear/style-clear/symbols/curling-m.svg +++ b/data/styles/clear/style-clear/symbols/curling-m.svg @@ -1,19 +1,7 @@ - - - - curling-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/curling-s.svg b/data/styles/clear/style-clear/symbols/curling-s.svg index 4f78847708..5b9f7fa125 100644 --- a/data/styles/clear/style-clear/symbols/curling-s.svg +++ b/data/styles/clear/style-clear/symbols/curling-s.svg @@ -1,19 +1,7 @@ - - - - curling-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/dentist-l.svg b/data/styles/clear/style-clear/symbols/dentist-l.svg index 1f64129840..e630ea84e2 100644 --- a/data/styles/clear/style-clear/symbols/dentist-l.svg +++ b/data/styles/clear/style-clear/symbols/dentist-l.svg @@ -1,19 +1,7 @@ - - - - dentist-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/dentist-m.svg b/data/styles/clear/style-clear/symbols/dentist-m.svg index f29e215ea7..5eb54caac5 100644 --- a/data/styles/clear/style-clear/symbols/dentist-m.svg +++ b/data/styles/clear/style-clear/symbols/dentist-m.svg @@ -1,19 +1,7 @@ - - - - dentist-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/dentist-s.svg b/data/styles/clear/style-clear/symbols/dentist-s.svg index 8f29030dd0..32fa380011 100644 --- a/data/styles/clear/style-clear/symbols/dentist-s.svg +++ b/data/styles/clear/style-clear/symbols/dentist-s.svg @@ -1,8 +1,7 @@ - - - - dentist-s - Created with Sketch. - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/department_store-l.svg b/data/styles/clear/style-clear/symbols/department_store-l.svg index 7105a2ee6c..6e26377f9c 100644 --- a/data/styles/clear/style-clear/symbols/department_store-l.svg +++ b/data/styles/clear/style-clear/symbols/department_store-l.svg @@ -1,19 +1,7 @@ - - - - department_store-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/department_store-m.svg b/data/styles/clear/style-clear/symbols/department_store-m.svg index 5e533553db..c2858bb73c 100644 --- a/data/styles/clear/style-clear/symbols/department_store-m.svg +++ b/data/styles/clear/style-clear/symbols/department_store-m.svg @@ -1,19 +1,7 @@ - - - - department_store-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/department_store-s.svg b/data/styles/clear/style-clear/symbols/department_store-s.svg index d96da54e6b..41689fe3b5 100644 --- a/data/styles/clear/style-clear/symbols/department_store-s.svg +++ b/data/styles/clear/style-clear/symbols/department_store-s.svg @@ -1,19 +1,7 @@ - - - - department_store-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/diving-l.svg b/data/styles/clear/style-clear/symbols/diving-l.svg index 7f29f7d935..432d26c088 100644 --- a/data/styles/clear/style-clear/symbols/diving-l.svg +++ b/data/styles/clear/style-clear/symbols/diving-l.svg @@ -1,19 +1,7 @@ - - - - diving-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/diving-m.svg b/data/styles/clear/style-clear/symbols/diving-m.svg index 87ad97355e..1714075871 100644 --- a/data/styles/clear/style-clear/symbols/diving-m.svg +++ b/data/styles/clear/style-clear/symbols/diving-m.svg @@ -1,19 +1,7 @@ - - - - diving-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/diving-s.svg b/data/styles/clear/style-clear/symbols/diving-s.svg index 3a0c92cd95..daedb30542 100644 --- a/data/styles/clear/style-clear/symbols/diving-s.svg +++ b/data/styles/clear/style-clear/symbols/diving-s.svg @@ -1,19 +1,7 @@ - - - - diving-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/dog_park-l.svg b/data/styles/clear/style-clear/symbols/dog_park-l.svg index 1a23983856..b88d87d0ac 100644 --- a/data/styles/clear/style-clear/symbols/dog_park-l.svg +++ b/data/styles/clear/style-clear/symbols/dog_park-l.svg @@ -1,19 +1,7 @@ - - - - dog_park-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/dog_park-m.svg b/data/styles/clear/style-clear/symbols/dog_park-m.svg index e9ffcbc352..c68021d4a4 100644 --- a/data/styles/clear/style-clear/symbols/dog_park-m.svg +++ b/data/styles/clear/style-clear/symbols/dog_park-m.svg @@ -1,19 +1,7 @@ - - - - dog_park-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/dog_park-s.svg b/data/styles/clear/style-clear/symbols/dog_park-s.svg index d13bddcd7c..94e688b9f1 100644 --- a/data/styles/clear/style-clear/symbols/dog_park-s.svg +++ b/data/styles/clear/style-clear/symbols/dog_park-s.svg @@ -1,19 +1,7 @@ - - - - dog_park-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/doityourself-l.svg b/data/styles/clear/style-clear/symbols/doityourself-l.svg index e15f1b291d..68b3cdc020 100644 --- a/data/styles/clear/style-clear/symbols/doityourself-l.svg +++ b/data/styles/clear/style-clear/symbols/doityourself-l.svg @@ -1,19 +1,7 @@ - - - - doityourself-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/doityourself-m.svg b/data/styles/clear/style-clear/symbols/doityourself-m.svg index 4d3caba835..b1c04b4bc9 100644 --- a/data/styles/clear/style-clear/symbols/doityourself-m.svg +++ b/data/styles/clear/style-clear/symbols/doityourself-m.svg @@ -1,19 +1,7 @@ - - - - doityourself-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/doityourself-s.svg b/data/styles/clear/style-clear/symbols/doityourself-s.svg index f820e3ae8c..21360c3fe1 100644 --- a/data/styles/clear/style-clear/symbols/doityourself-s.svg +++ b/data/styles/clear/style-clear/symbols/doityourself-s.svg @@ -1,19 +1,7 @@ - - - - doityourself-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/dot-m.svg b/data/styles/clear/style-clear/symbols/dot-m.svg index 32d7f3bdea..5d0b439598 100644 --- a/data/styles/clear/style-clear/symbols/dot-m.svg +++ b/data/styles/clear/style-clear/symbols/dot-m.svg @@ -1,15 +1,6 @@ - - - - dot-m - Created with Sketch. - - - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/dot-s-light.svg b/data/styles/clear/style-clear/symbols/dot-s-light.svg deleted file mode 100644 index 6cb54118ee..0000000000 --- a/data/styles/clear/style-clear/symbols/dot-s-light.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - dot-s-light - Created with Sketch. - - - \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/dot-s.svg b/data/styles/clear/style-clear/symbols/dot-s.svg index 1d7c7b6bec..2deb49c42c 100644 --- a/data/styles/clear/style-clear/symbols/dot-s.svg +++ b/data/styles/clear/style-clear/symbols/dot-s.svg @@ -1,14 +1,3 @@ - - - - dot-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-clear/symbols/drinking-water-l.svg b/data/styles/clear/style-clear/symbols/drinking-water-l.svg index ce8db52f17..a0da362a34 100644 --- a/data/styles/clear/style-clear/symbols/drinking-water-l.svg +++ b/data/styles/clear/style-clear/symbols/drinking-water-l.svg @@ -1,16 +1,7 @@ - - - - drinking-water-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/drinking-water-m.svg b/data/styles/clear/style-clear/symbols/drinking-water-m.svg index 1100cc512f..3505d7a041 100644 --- a/data/styles/clear/style-clear/symbols/drinking-water-m.svg +++ b/data/styles/clear/style-clear/symbols/drinking-water-m.svg @@ -1,16 +1,7 @@ - - - - drinking-water-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/drinking-water-s.svg b/data/styles/clear/style-clear/symbols/drinking-water-s.svg index 89f54acc40..1f93fb4970 100644 --- a/data/styles/clear/style-clear/symbols/drinking-water-s.svg +++ b/data/styles/clear/style-clear/symbols/drinking-water-s.svg @@ -1,16 +1,7 @@ - - - - drinking-water-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/electronics-l.svg b/data/styles/clear/style-clear/symbols/electronics-l.svg index 880e79df45..97e394b534 100644 --- a/data/styles/clear/style-clear/symbols/electronics-l.svg +++ b/data/styles/clear/style-clear/symbols/electronics-l.svg @@ -1,19 +1,7 @@ - - - - electronics-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/electronics-m.svg b/data/styles/clear/style-clear/symbols/electronics-m.svg index 3a371290d9..dc26c65235 100644 --- a/data/styles/clear/style-clear/symbols/electronics-m.svg +++ b/data/styles/clear/style-clear/symbols/electronics-m.svg @@ -1,19 +1,7 @@ - - - - electronics-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/electronics-s.svg b/data/styles/clear/style-clear/symbols/electronics-s.svg index b1c3825281..dfecfa9573 100644 --- a/data/styles/clear/style-clear/symbols/electronics-s.svg +++ b/data/styles/clear/style-clear/symbols/electronics-s.svg @@ -1,19 +1,7 @@ - - - - electronics-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/embassy-l.svg b/data/styles/clear/style-clear/symbols/embassy-l.svg index 94b1965338..8be1ff15dc 100644 --- a/data/styles/clear/style-clear/symbols/embassy-l.svg +++ b/data/styles/clear/style-clear/symbols/embassy-l.svg @@ -1,19 +1,7 @@ - - - - embassy-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/embassy-m.svg b/data/styles/clear/style-clear/symbols/embassy-m.svg index 41bcc23450..c53102debb 100644 --- a/data/styles/clear/style-clear/symbols/embassy-m.svg +++ b/data/styles/clear/style-clear/symbols/embassy-m.svg @@ -1,19 +1,7 @@ - - - - embassy-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/embassy-s.svg b/data/styles/clear/style-clear/symbols/embassy-s.svg index 7b40123ca5..c95241d454 100644 --- a/data/styles/clear/style-clear/symbols/embassy-s.svg +++ b/data/styles/clear/style-clear/symbols/embassy-s.svg @@ -1,19 +1,7 @@ - - - - embassy-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/entrance-s.svg b/data/styles/clear/style-clear/symbols/entrance-s.svg index 577d13a676..cba5a23621 100644 --- a/data/styles/clear/style-clear/symbols/entrance-s.svg +++ b/data/styles/clear/style-clear/symbols/entrance-s.svg @@ -1,13 +1,6 @@ - - - - entrance-s - Created with Sketch. - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/entrance-xs.svg b/data/styles/clear/style-clear/symbols/entrance-xs.svg index 6dbf627cb0..f694c94247 100644 --- a/data/styles/clear/style-clear/symbols/entrance-xs.svg +++ b/data/styles/clear/style-clear/symbols/entrance-xs.svg @@ -1,12 +1,3 @@ - - - - entrance-xs - Created with Sketch. - - - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-clear/symbols/equestrian-l.svg b/data/styles/clear/style-clear/symbols/equestrian-l.svg index a1a9e30234..d6f45a585e 100644 --- a/data/styles/clear/style-clear/symbols/equestrian-l.svg +++ b/data/styles/clear/style-clear/symbols/equestrian-l.svg @@ -1,21 +1,7 @@ - - - - equestrian-l - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/equestrian-m.svg b/data/styles/clear/style-clear/symbols/equestrian-m.svg index a233dbb997..820bd00869 100644 --- a/data/styles/clear/style-clear/symbols/equestrian-m.svg +++ b/data/styles/clear/style-clear/symbols/equestrian-m.svg @@ -1,19 +1,7 @@ - - - - equestrian-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/equestrian-s.svg b/data/styles/clear/style-clear/symbols/equestrian-s.svg new file mode 100644 index 0000000000..bd29ed8053 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/equestrian-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/fastfood-l.svg b/data/styles/clear/style-clear/symbols/fastfood-l.svg index 98546e7631..36bfc9ba74 100644 --- a/data/styles/clear/style-clear/symbols/fastfood-l.svg +++ b/data/styles/clear/style-clear/symbols/fastfood-l.svg @@ -1,23 +1,7 @@ - - - - fastfood-l - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/fastfood-m.svg b/data/styles/clear/style-clear/symbols/fastfood-m.svg index cee756e966..246cfe4c5a 100644 --- a/data/styles/clear/style-clear/symbols/fastfood-m.svg +++ b/data/styles/clear/style-clear/symbols/fastfood-m.svg @@ -1,21 +1,7 @@ - - - - fastfood-m - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/fastfood-s.svg b/data/styles/clear/style-clear/symbols/fastfood-s.svg index 8032e28546..9364919c41 100644 --- a/data/styles/clear/style-clear/symbols/fastfood-s.svg +++ b/data/styles/clear/style-clear/symbols/fastfood-s.svg @@ -1,21 +1,7 @@ - - - - fastfood-s - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/fire_station-l.svg b/data/styles/clear/style-clear/symbols/fire_station-l.svg index b649e9f269..a75719956f 100644 --- a/data/styles/clear/style-clear/symbols/fire_station-l.svg +++ b/data/styles/clear/style-clear/symbols/fire_station-l.svg @@ -1,19 +1,7 @@ - - - - fire_station-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/fire_station-m.svg b/data/styles/clear/style-clear/symbols/fire_station-m.svg index b9fc75984e..296f3749ca 100644 --- a/data/styles/clear/style-clear/symbols/fire_station-m.svg +++ b/data/styles/clear/style-clear/symbols/fire_station-m.svg @@ -1,19 +1,7 @@ - - - - fire_station-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/fire_station-s.svg b/data/styles/clear/style-clear/symbols/fire_station-s.svg index ef6eecfbac..8bffe8f527 100644 --- a/data/styles/clear/style-clear/symbols/fire_station-s.svg +++ b/data/styles/clear/style-clear/symbols/fire_station-s.svg @@ -1,19 +1,7 @@ - - - - fire_station-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/firehydrant-l.svg b/data/styles/clear/style-clear/symbols/firehydrant-l.svg index 819fa6f263..f890a3364b 100644 --- a/data/styles/clear/style-clear/symbols/firehydrant-l.svg +++ b/data/styles/clear/style-clear/symbols/firehydrant-l.svg @@ -1,22 +1,6 @@ - - - - firehydrant-l - Created with Sketch. - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/firehydrant-m.svg b/data/styles/clear/style-clear/symbols/firehydrant-m.svg new file mode 100644 index 0000000000..c1b89c280e --- /dev/null +++ b/data/styles/clear/style-clear/symbols/firehydrant-m.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/data/styles/clear/style-clear/symbols/firehydrant-s.svg b/data/styles/clear/style-clear/symbols/firehydrant-s.svg new file mode 100644 index 0000000000..64da4c0ea1 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/firehydrant-s.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/data/styles/clear/style-clear/symbols/florist-l.svg b/data/styles/clear/style-clear/symbols/florist-l.svg index 9a3f5331f8..8fb7eba485 100644 --- a/data/styles/clear/style-clear/symbols/florist-l.svg +++ b/data/styles/clear/style-clear/symbols/florist-l.svg @@ -1,19 +1,7 @@ - - - - florist-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/florist-m.svg b/data/styles/clear/style-clear/symbols/florist-m.svg index a395f5d2b2..7c7de52c87 100644 --- a/data/styles/clear/style-clear/symbols/florist-m.svg +++ b/data/styles/clear/style-clear/symbols/florist-m.svg @@ -1,19 +1,7 @@ - - - - florist-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/florist-s.svg b/data/styles/clear/style-clear/symbols/florist-s.svg index f8b12f788b..f7eacfe7b7 100644 --- a/data/styles/clear/style-clear/symbols/florist-s.svg +++ b/data/styles/clear/style-clear/symbols/florist-s.svg @@ -1,19 +1,7 @@ - - - - florist-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/fountain-l.svg b/data/styles/clear/style-clear/symbols/fountain-l.svg index 397a94b8ba..4a6fac8c64 100644 --- a/data/styles/clear/style-clear/symbols/fountain-l.svg +++ b/data/styles/clear/style-clear/symbols/fountain-l.svg @@ -1,16 +1,7 @@ - - - - fountain-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/fountain-m.svg b/data/styles/clear/style-clear/symbols/fountain-m.svg index bd491bd706..cbebe4207a 100644 --- a/data/styles/clear/style-clear/symbols/fountain-m.svg +++ b/data/styles/clear/style-clear/symbols/fountain-m.svg @@ -1,16 +1,7 @@ - - - - fountain-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/fountain-s.svg b/data/styles/clear/style-clear/symbols/fountain-s.svg index 29ba17756c..770685dee8 100644 --- a/data/styles/clear/style-clear/symbols/fountain-s.svg +++ b/data/styles/clear/style-clear/symbols/fountain-s.svg @@ -1,16 +1,7 @@ - - - - fountain-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/fuel-l.svg b/data/styles/clear/style-clear/symbols/fuel-l.svg index d6a8828f92..2ff5e98eff 100644 --- a/data/styles/clear/style-clear/symbols/fuel-l.svg +++ b/data/styles/clear/style-clear/symbols/fuel-l.svg @@ -1,27 +1,7 @@ - - - - fuel-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/fuel-m.svg b/data/styles/clear/style-clear/symbols/fuel-m.svg index c1d0daa668..7df388adb1 100644 --- a/data/styles/clear/style-clear/symbols/fuel-m.svg +++ b/data/styles/clear/style-clear/symbols/fuel-m.svg @@ -1,16 +1,7 @@ - - - - fuel-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/fuel-s.svg b/data/styles/clear/style-clear/symbols/fuel-s.svg index 8b1d4650dd..4b62a19b9a 100644 --- a/data/styles/clear/style-clear/symbols/fuel-s.svg +++ b/data/styles/clear/style-clear/symbols/fuel-s.svg @@ -1,16 +1,7 @@ - - - - fuel-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/funicular-l.svg b/data/styles/clear/style-clear/symbols/funicular-l.svg index a0fcd283d1..45b618c333 100644 --- a/data/styles/clear/style-clear/symbols/funicular-l.svg +++ b/data/styles/clear/style-clear/symbols/funicular-l.svg @@ -1,23 +1,7 @@ - - - - funicular-l - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/funicular-m.svg b/data/styles/clear/style-clear/symbols/funicular-m.svg index 68744c5da1..4a7ed82fd8 100644 --- a/data/styles/clear/style-clear/symbols/funicular-m.svg +++ b/data/styles/clear/style-clear/symbols/funicular-m.svg @@ -1,23 +1,7 @@ - - - - funicular-m - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/funicular-s.svg b/data/styles/clear/style-clear/symbols/funicular-s.svg index a4386ba8da..aba2e527a9 100644 --- a/data/styles/clear/style-clear/symbols/funicular-s.svg +++ b/data/styles/clear/style-clear/symbols/funicular-s.svg @@ -1,23 +1,7 @@ - - - - funicular-s - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/furniture-l.svg b/data/styles/clear/style-clear/symbols/furniture-l.svg index 725a382015..a2f986f4a4 100644 --- a/data/styles/clear/style-clear/symbols/furniture-l.svg +++ b/data/styles/clear/style-clear/symbols/furniture-l.svg @@ -1,19 +1,7 @@ - - - - furniture-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/furniture-m.svg b/data/styles/clear/style-clear/symbols/furniture-m.svg index 1768fa51da..f27ef8cd1f 100644 --- a/data/styles/clear/style-clear/symbols/furniture-m.svg +++ b/data/styles/clear/style-clear/symbols/furniture-m.svg @@ -1,19 +1,7 @@ - - - - furniture-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/furniture-s.svg b/data/styles/clear/style-clear/symbols/furniture-s.svg index f8f62674b4..708384175a 100644 --- a/data/styles/clear/style-clear/symbols/furniture-s.svg +++ b/data/styles/clear/style-clear/symbols/furniture-s.svg @@ -1,19 +1,7 @@ - - - - furniture-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/gallery-l.svg b/data/styles/clear/style-clear/symbols/gallery-l.svg index 894b867f59..bc8dd3ef26 100644 --- a/data/styles/clear/style-clear/symbols/gallery-l.svg +++ b/data/styles/clear/style-clear/symbols/gallery-l.svg @@ -1,14 +1,7 @@ - - - - gallery-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/gallery-m.svg b/data/styles/clear/style-clear/symbols/gallery-m.svg index de035d8e73..630922726c 100644 --- a/data/styles/clear/style-clear/symbols/gallery-m.svg +++ b/data/styles/clear/style-clear/symbols/gallery-m.svg @@ -1,14 +1,7 @@ - - - - gallery-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/gallery-s.svg b/data/styles/clear/style-clear/symbols/gallery-s.svg index a9d75369ba..bea55b87a0 100644 --- a/data/styles/clear/style-clear/symbols/gallery-s.svg +++ b/data/styles/clear/style-clear/symbols/gallery-s.svg @@ -1,14 +1,7 @@ - - - - gallery-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/garden-l.svg b/data/styles/clear/style-clear/symbols/garden-l.svg index ef4cb4f90e..c767f7945f 100644 --- a/data/styles/clear/style-clear/symbols/garden-l.svg +++ b/data/styles/clear/style-clear/symbols/garden-l.svg @@ -1,16 +1,7 @@ - - - - garden-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/garden-m.svg b/data/styles/clear/style-clear/symbols/garden-m.svg index 6edf87836c..caad6d6e69 100644 --- a/data/styles/clear/style-clear/symbols/garden-m.svg +++ b/data/styles/clear/style-clear/symbols/garden-m.svg @@ -1,16 +1,7 @@ - - - - garden-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/garden-s.svg b/data/styles/clear/style-clear/symbols/garden-s.svg index 5f279a25d1..b8c2b96b52 100644 --- a/data/styles/clear/style-clear/symbols/garden-s.svg +++ b/data/styles/clear/style-clear/symbols/garden-s.svg @@ -1,16 +1,7 @@ - - - - garden-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/garden_center-l.svg b/data/styles/clear/style-clear/symbols/garden_center-l.svg index 084535b8f8..337e1242c6 100644 --- a/data/styles/clear/style-clear/symbols/garden_center-l.svg +++ b/data/styles/clear/style-clear/symbols/garden_center-l.svg @@ -1,19 +1,7 @@ - - - - garden_center-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/garden_center-m.svg b/data/styles/clear/style-clear/symbols/garden_center-m.svg index 2e8b78242c..dc81fe8fcc 100644 --- a/data/styles/clear/style-clear/symbols/garden_center-m.svg +++ b/data/styles/clear/style-clear/symbols/garden_center-m.svg @@ -1,19 +1,7 @@ - - - - garden_center-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/garden_center-s.svg b/data/styles/clear/style-clear/symbols/garden_center-s.svg index a221301df4..945840c655 100644 --- a/data/styles/clear/style-clear/symbols/garden_center-s.svg +++ b/data/styles/clear/style-clear/symbols/garden_center-s.svg @@ -1,19 +1,7 @@ - - - - garden_center-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/gate-l.svg b/data/styles/clear/style-clear/symbols/gate-l.svg index 12e613b471..b19d819abd 100644 --- a/data/styles/clear/style-clear/symbols/gate-l.svg +++ b/data/styles/clear/style-clear/symbols/gate-l.svg @@ -1,19 +1,7 @@ - - - - gate-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/gate-m.svg b/data/styles/clear/style-clear/symbols/gate-m.svg index d2b9f252e4..85dabf0edd 100644 --- a/data/styles/clear/style-clear/symbols/gate-m.svg +++ b/data/styles/clear/style-clear/symbols/gate-m.svg @@ -1,19 +1,7 @@ - - - - gate-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/gate-s.svg b/data/styles/clear/style-clear/symbols/gate-s.svg index 7e45bfb61f..27808ffdb5 100644 --- a/data/styles/clear/style-clear/symbols/gate-s.svg +++ b/data/styles/clear/style-clear/symbols/gate-s.svg @@ -1,19 +1,7 @@ - - - - gate-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/gift-l.svg b/data/styles/clear/style-clear/symbols/gift-l.svg index 6658fe2aff..9ec3187872 100644 --- a/data/styles/clear/style-clear/symbols/gift-l.svg +++ b/data/styles/clear/style-clear/symbols/gift-l.svg @@ -1,19 +1,7 @@ - - - - gift-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/gift-m.svg b/data/styles/clear/style-clear/symbols/gift-m.svg index 3cc2515bb6..66fa9e279b 100644 --- a/data/styles/clear/style-clear/symbols/gift-m.svg +++ b/data/styles/clear/style-clear/symbols/gift-m.svg @@ -1,19 +1,7 @@ - - - - gift-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/gift-s.svg b/data/styles/clear/style-clear/symbols/gift-s.svg index b414fb79e9..72f5b192c3 100644 --- a/data/styles/clear/style-clear/symbols/gift-s.svg +++ b/data/styles/clear/style-clear/symbols/gift-s.svg @@ -1,19 +1,7 @@ - - - - gift-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/golf-l.svg b/data/styles/clear/style-clear/symbols/golf-l.svg index 1ec8488965..c1e3f2c892 100644 --- a/data/styles/clear/style-clear/symbols/golf-l.svg +++ b/data/styles/clear/style-clear/symbols/golf-l.svg @@ -1,19 +1,7 @@ - - - - golf-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/golf-m.svg b/data/styles/clear/style-clear/symbols/golf-m.svg index 50417ea9c3..e145ea920d 100644 --- a/data/styles/clear/style-clear/symbols/golf-m.svg +++ b/data/styles/clear/style-clear/symbols/golf-m.svg @@ -1,19 +1,7 @@ - - - - golf-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/golf-s.svg b/data/styles/clear/style-clear/symbols/golf-s.svg index a36ff90184..4c3ca21eea 100644 --- a/data/styles/clear/style-clear/symbols/golf-s.svg +++ b/data/styles/clear/style-clear/symbols/golf-s.svg @@ -1,19 +1,7 @@ - - - - golf-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/greengrocer-l.svg b/data/styles/clear/style-clear/symbols/greengrocer-l.svg index 1c23497c85..9da5172c46 100644 --- a/data/styles/clear/style-clear/symbols/greengrocer-l.svg +++ b/data/styles/clear/style-clear/symbols/greengrocer-l.svg @@ -1,19 +1,7 @@ - - - - greengrocer-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/greengrocer-m.svg b/data/styles/clear/style-clear/symbols/greengrocer-m.svg index f9d4ac6150..5a01249b83 100644 --- a/data/styles/clear/style-clear/symbols/greengrocer-m.svg +++ b/data/styles/clear/style-clear/symbols/greengrocer-m.svg @@ -1,19 +1,7 @@ - - - - greengrocer-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/greengrocer-s.svg b/data/styles/clear/style-clear/symbols/greengrocer-s.svg index a2542f607d..9ff8f29fac 100644 --- a/data/styles/clear/style-clear/symbols/greengrocer-s.svg +++ b/data/styles/clear/style-clear/symbols/greengrocer-s.svg @@ -1,19 +1,7 @@ - - - - greengrocer-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/grocery-l.svg b/data/styles/clear/style-clear/symbols/grocery-l.svg index b8e54fffc0..c25fb8b515 100644 --- a/data/styles/clear/style-clear/symbols/grocery-l.svg +++ b/data/styles/clear/style-clear/symbols/grocery-l.svg @@ -1,19 +1,7 @@ - - - - grocery-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/grocery-m.svg b/data/styles/clear/style-clear/symbols/grocery-m.svg index ce0bb0ecb8..10b698fb67 100644 --- a/data/styles/clear/style-clear/symbols/grocery-m.svg +++ b/data/styles/clear/style-clear/symbols/grocery-m.svg @@ -1,23 +1,7 @@ - - - - grocery-m - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/grocery-s.svg b/data/styles/clear/style-clear/symbols/grocery-s.svg index 1ed245a72b..43a52df74f 100644 --- a/data/styles/clear/style-clear/symbols/grocery-s.svg +++ b/data/styles/clear/style-clear/symbols/grocery-s.svg @@ -1,19 +1,7 @@ - - - - grocery-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/gym-l.svg b/data/styles/clear/style-clear/symbols/gym-l.svg index 26d52ea2cf..d0af9dc43a 100644 --- a/data/styles/clear/style-clear/symbols/gym-l.svg +++ b/data/styles/clear/style-clear/symbols/gym-l.svg @@ -1,25 +1,7 @@ - - - - gym-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/gym-m.svg b/data/styles/clear/style-clear/symbols/gym-m.svg index 5cb2c164d1..5f507c91a4 100644 --- a/data/styles/clear/style-clear/symbols/gym-m.svg +++ b/data/styles/clear/style-clear/symbols/gym-m.svg @@ -1,19 +1,7 @@ - - - - gym-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/gym-s.svg b/data/styles/clear/style-clear/symbols/gym-s.svg index 1d9e610e38..879642bd43 100644 --- a/data/styles/clear/style-clear/symbols/gym-s.svg +++ b/data/styles/clear/style-clear/symbols/gym-s.svg @@ -1,14 +1,7 @@ - - - - gym-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/hairdresser-l.svg b/data/styles/clear/style-clear/symbols/hairdresser-l.svg index d92689b43d..05e3890876 100644 --- a/data/styles/clear/style-clear/symbols/hairdresser-l.svg +++ b/data/styles/clear/style-clear/symbols/hairdresser-l.svg @@ -1,19 +1,7 @@ - - - - hairdresser-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/hairdresser-m.svg b/data/styles/clear/style-clear/symbols/hairdresser-m.svg index 827af1fd43..ee5f84a1be 100644 --- a/data/styles/clear/style-clear/symbols/hairdresser-m.svg +++ b/data/styles/clear/style-clear/symbols/hairdresser-m.svg @@ -1,19 +1,7 @@ - - - - hairdresser-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/hairdresser-s.svg b/data/styles/clear/style-clear/symbols/hairdresser-s.svg index 083e72c4af..57190abdd7 100644 --- a/data/styles/clear/style-clear/symbols/hairdresser-s.svg +++ b/data/styles/clear/style-clear/symbols/hairdresser-s.svg @@ -1,19 +1,7 @@ - - - - hairdresser-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/hand-l.svg b/data/styles/clear/style-clear/symbols/hand-l.svg index d1dce703d5..97868c8c75 100644 --- a/data/styles/clear/style-clear/symbols/hand-l.svg +++ b/data/styles/clear/style-clear/symbols/hand-l.svg @@ -1,23 +1,7 @@ - - - - hand-l - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/hand-m.svg b/data/styles/clear/style-clear/symbols/hand-m.svg index 1ed4b7f640..0e3509a1d4 100644 --- a/data/styles/clear/style-clear/symbols/hand-m.svg +++ b/data/styles/clear/style-clear/symbols/hand-m.svg @@ -1,23 +1,7 @@ - - - - hand-m - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/hand-s.svg b/data/styles/clear/style-clear/symbols/hand-s.svg new file mode 100644 index 0000000000..fa40b07151 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/hand-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/hardware-l.svg b/data/styles/clear/style-clear/symbols/hardware-l.svg index fc317937d5..9a848599a4 100644 --- a/data/styles/clear/style-clear/symbols/hardware-l.svg +++ b/data/styles/clear/style-clear/symbols/hardware-l.svg @@ -1,19 +1,7 @@ - - - - hardware-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/hardware-m.svg b/data/styles/clear/style-clear/symbols/hardware-m.svg index a78aa9ad11..ea7cbebde1 100644 --- a/data/styles/clear/style-clear/symbols/hardware-m.svg +++ b/data/styles/clear/style-clear/symbols/hardware-m.svg @@ -1,19 +1,7 @@ - - - - hardware-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/hardware-s.svg b/data/styles/clear/style-clear/symbols/hardware-s.svg index 86c848f088..b3b3a9d6ed 100644 --- a/data/styles/clear/style-clear/symbols/hardware-s.svg +++ b/data/styles/clear/style-clear/symbols/hardware-s.svg @@ -1,19 +1,7 @@ - - - - hardware-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/helipad-l.svg b/data/styles/clear/style-clear/symbols/helipad-l.svg index 5e35fa88f9..7725ca50c0 100644 --- a/data/styles/clear/style-clear/symbols/helipad-l.svg +++ b/data/styles/clear/style-clear/symbols/helipad-l.svg @@ -1,20 +1,7 @@ - - - - helipad-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/helipad-m.svg b/data/styles/clear/style-clear/symbols/helipad-m.svg index df00247724..544856894d 100644 --- a/data/styles/clear/style-clear/symbols/helipad-m.svg +++ b/data/styles/clear/style-clear/symbols/helipad-m.svg @@ -1,20 +1,7 @@ - - - - helipad-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/helipad-s.svg b/data/styles/clear/style-clear/symbols/helipad-s.svg index fb76799393..d565c697ad 100644 --- a/data/styles/clear/style-clear/symbols/helipad-s.svg +++ b/data/styles/clear/style-clear/symbols/helipad-s.svg @@ -1,20 +1,7 @@ - - - - helipad-s - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/heliport-l.svg b/data/styles/clear/style-clear/symbols/heliport-l.svg index bce463875e..7a570b7409 100644 --- a/data/styles/clear/style-clear/symbols/heliport-l.svg +++ b/data/styles/clear/style-clear/symbols/heliport-l.svg @@ -1,14 +1,7 @@ - - - - heliport-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/heliport-m.svg b/data/styles/clear/style-clear/symbols/heliport-m.svg index 064e74500d..e26c5a7bcd 100644 --- a/data/styles/clear/style-clear/symbols/heliport-m.svg +++ b/data/styles/clear/style-clear/symbols/heliport-m.svg @@ -1,19 +1,7 @@ - - - - heliport-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/heliport-s.svg b/data/styles/clear/style-clear/symbols/heliport-s.svg index 990154ccde..a2c4c213c3 100644 --- a/data/styles/clear/style-clear/symbols/heliport-s.svg +++ b/data/styles/clear/style-clear/symbols/heliport-s.svg @@ -1,18 +1,7 @@ - - - - heliport-s - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/hindu-l.svg b/data/styles/clear/style-clear/symbols/hindu-l.svg index 98b44c76d7..61f0bb7e2b 100644 --- a/data/styles/clear/style-clear/symbols/hindu-l.svg +++ b/data/styles/clear/style-clear/symbols/hindu-l.svg @@ -1,16 +1,7 @@ - - - - hindu-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/hindu-m.svg b/data/styles/clear/style-clear/symbols/hindu-m.svg index 66c57ce5a6..8dd5223dc7 100644 --- a/data/styles/clear/style-clear/symbols/hindu-m.svg +++ b/data/styles/clear/style-clear/symbols/hindu-m.svg @@ -1,16 +1,7 @@ - - - - hindu-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/hindu-s.svg b/data/styles/clear/style-clear/symbols/hindu-s.svg index 0f76335d9a..451d729d32 100644 --- a/data/styles/clear/style-clear/symbols/hindu-s.svg +++ b/data/styles/clear/style-clear/symbols/hindu-s.svg @@ -1,16 +1,7 @@ - - - - hindu-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/historic-ship-l.svg b/data/styles/clear/style-clear/symbols/historic-ship-l.svg index c47ba466b3..43aef45f55 100644 --- a/data/styles/clear/style-clear/symbols/historic-ship-l.svg +++ b/data/styles/clear/style-clear/symbols/historic-ship-l.svg @@ -1,19 +1,7 @@ - - - - historic-ship-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/historic-ship-m.svg b/data/styles/clear/style-clear/symbols/historic-ship-m.svg index 69bbfbb87c..6119f7d5ef 100644 --- a/data/styles/clear/style-clear/symbols/historic-ship-m.svg +++ b/data/styles/clear/style-clear/symbols/historic-ship-m.svg @@ -1,19 +1,7 @@ - - - - historic-ship-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/historic-ship-s.svg b/data/styles/clear/style-clear/symbols/historic-ship-s.svg index 38995b384b..78e0986194 100644 --- a/data/styles/clear/style-clear/symbols/historic-ship-s.svg +++ b/data/styles/clear/style-clear/symbols/historic-ship-s.svg @@ -1,19 +1,7 @@ - - - - historic-ship-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/hospital-l.svg b/data/styles/clear/style-clear/symbols/hospital-l.svg index 47f3c34c5b..6bb3eb46f3 100644 --- a/data/styles/clear/style-clear/symbols/hospital-l.svg +++ b/data/styles/clear/style-clear/symbols/hospital-l.svg @@ -1,16 +1,7 @@ - - - - hospital-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/hospital-m.svg b/data/styles/clear/style-clear/symbols/hospital-m.svg index 3b41fe9e9d..d31a59f405 100644 --- a/data/styles/clear/style-clear/symbols/hospital-m.svg +++ b/data/styles/clear/style-clear/symbols/hospital-m.svg @@ -1,16 +1,7 @@ - - - - hospital-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/hospital-s.svg b/data/styles/clear/style-clear/symbols/hospital-s.svg index cc9412a53a..f0518d498d 100644 --- a/data/styles/clear/style-clear/symbols/hospital-s.svg +++ b/data/styles/clear/style-clear/symbols/hospital-s.svg @@ -1,16 +1,7 @@ - - - - hospital-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/hostel-l.svg b/data/styles/clear/style-clear/symbols/hostel-l.svg index 64597a3f8f..bf5c43ad45 100644 --- a/data/styles/clear/style-clear/symbols/hostel-l.svg +++ b/data/styles/clear/style-clear/symbols/hostel-l.svg @@ -1,16 +1,7 @@ - - - - hostel-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/hostel-m.svg b/data/styles/clear/style-clear/symbols/hostel-m.svg index 919c44e34d..404db84fac 100644 --- a/data/styles/clear/style-clear/symbols/hostel-m.svg +++ b/data/styles/clear/style-clear/symbols/hostel-m.svg @@ -1,14 +1,7 @@ - - - - hostel-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/hostel-s.svg b/data/styles/clear/style-clear/symbols/hostel-s.svg index 2ce5458320..0b1c2118f2 100644 --- a/data/styles/clear/style-clear/symbols/hostel-s.svg +++ b/data/styles/clear/style-clear/symbols/hostel-s.svg @@ -1,14 +1,7 @@ - - - - hostel-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/hotel-l.svg b/data/styles/clear/style-clear/symbols/hotel-l.svg index 60e2f37d95..844a007713 100644 --- a/data/styles/clear/style-clear/symbols/hotel-l.svg +++ b/data/styles/clear/style-clear/symbols/hotel-l.svg @@ -1,14 +1,7 @@ - - - - hotel-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/hotel-m.svg b/data/styles/clear/style-clear/symbols/hotel-m.svg index e9984cc2ed..0a15a8a484 100644 --- a/data/styles/clear/style-clear/symbols/hotel-m.svg +++ b/data/styles/clear/style-clear/symbols/hotel-m.svg @@ -1,14 +1,7 @@ - - - - hotel-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/hotel-s.svg b/data/styles/clear/style-clear/symbols/hotel-s.svg index 584876b05b..37e6e34290 100644 --- a/data/styles/clear/style-clear/symbols/hotel-s.svg +++ b/data/styles/clear/style-clear/symbols/hotel-s.svg @@ -1,14 +1,7 @@ - - - - hotel-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/hunting-tower-l.svg b/data/styles/clear/style-clear/symbols/hunting-tower-l.svg index 1dd20c1f57..560b733e7c 100644 --- a/data/styles/clear/style-clear/symbols/hunting-tower-l.svg +++ b/data/styles/clear/style-clear/symbols/hunting-tower-l.svg @@ -1,23 +1,7 @@ - - - - hunting-tower-l - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/hunting-tower-m.svg b/data/styles/clear/style-clear/symbols/hunting-tower-m.svg index 70c2baf200..be74cee49c 100644 --- a/data/styles/clear/style-clear/symbols/hunting-tower-m.svg +++ b/data/styles/clear/style-clear/symbols/hunting-tower-m.svg @@ -1,23 +1,7 @@ - - - - hunting-tower-m - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/hunting-tower-s.svg b/data/styles/clear/style-clear/symbols/hunting-tower-s.svg new file mode 100644 index 0000000000..6853e33ad0 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/hunting-tower-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/information-l.svg b/data/styles/clear/style-clear/symbols/information-l.svg index 59867c517e..433b9d1c55 100644 --- a/data/styles/clear/style-clear/symbols/information-l.svg +++ b/data/styles/clear/style-clear/symbols/information-l.svg @@ -1,19 +1,7 @@ - - - - information-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/information-m.svg b/data/styles/clear/style-clear/symbols/information-m.svg index 40f2b20545..b9c4838741 100644 --- a/data/styles/clear/style-clear/symbols/information-m.svg +++ b/data/styles/clear/style-clear/symbols/information-m.svg @@ -1,19 +1,7 @@ - - - - information-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/information-s.svg b/data/styles/clear/style-clear/symbols/information-s.svg index 944b1cb7e7..396d00dcd3 100644 --- a/data/styles/clear/style-clear/symbols/information-s.svg +++ b/data/styles/clear/style-clear/symbols/information-s.svg @@ -1,19 +1,7 @@ - - - - information-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/jewelry-l.svg b/data/styles/clear/style-clear/symbols/jewelry-l.svg index 317ec2d36f..6a5d0b4aeb 100644 --- a/data/styles/clear/style-clear/symbols/jewelry-l.svg +++ b/data/styles/clear/style-clear/symbols/jewelry-l.svg @@ -1,19 +1,7 @@ - - - - jewelry-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/jewelry-m.svg b/data/styles/clear/style-clear/symbols/jewelry-m.svg index a8e507e973..8fe025fdec 100644 --- a/data/styles/clear/style-clear/symbols/jewelry-m.svg +++ b/data/styles/clear/style-clear/symbols/jewelry-m.svg @@ -1,19 +1,7 @@ - - - - jewelry-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/jewelry-s.svg b/data/styles/clear/style-clear/symbols/jewelry-s.svg index d3d692a09c..1fa12456bc 100644 --- a/data/styles/clear/style-clear/symbols/jewelry-s.svg +++ b/data/styles/clear/style-clear/symbols/jewelry-s.svg @@ -1,19 +1,7 @@ - - - - jewelry-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/jewish-l.svg b/data/styles/clear/style-clear/symbols/jewish-l.svg index 62b21d44d0..c1580dc8d2 100644 --- a/data/styles/clear/style-clear/symbols/jewish-l.svg +++ b/data/styles/clear/style-clear/symbols/jewish-l.svg @@ -1,16 +1,7 @@ - - - - jewish-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/jewish-m.svg b/data/styles/clear/style-clear/symbols/jewish-m.svg index 6dcaae0c47..f5e14c38a0 100644 --- a/data/styles/clear/style-clear/symbols/jewish-m.svg +++ b/data/styles/clear/style-clear/symbols/jewish-m.svg @@ -1,16 +1,7 @@ - - - - jewish-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/jewish-s.svg b/data/styles/clear/style-clear/symbols/jewish-s.svg index 2b17e39750..62fdb039a8 100644 --- a/data/styles/clear/style-clear/symbols/jewish-s.svg +++ b/data/styles/clear/style-clear/symbols/jewish-s.svg @@ -1,16 +1,7 @@ - - - - jewish-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/kindergarten-l.svg b/data/styles/clear/style-clear/symbols/kindergarten-l.svg index da6a36a238..b792caf17e 100644 --- a/data/styles/clear/style-clear/symbols/kindergarten-l.svg +++ b/data/styles/clear/style-clear/symbols/kindergarten-l.svg @@ -1,21 +1,7 @@ - - - - kindergarten-l - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/kindergarten-m.svg b/data/styles/clear/style-clear/symbols/kindergarten-m.svg index c27a39aca8..d7c8a79874 100644 --- a/data/styles/clear/style-clear/symbols/kindergarten-m.svg +++ b/data/styles/clear/style-clear/symbols/kindergarten-m.svg @@ -1,19 +1,7 @@ - - - - kindergarten-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/kindergarten-s.svg b/data/styles/clear/style-clear/symbols/kindergarten-s.svg index 98329cd18c..7771fa8c1b 100644 --- a/data/styles/clear/style-clear/symbols/kindergarten-s.svg +++ b/data/styles/clear/style-clear/symbols/kindergarten-s.svg @@ -1,19 +1,7 @@ - - - - kindergarten-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/kiosk-l.svg b/data/styles/clear/style-clear/symbols/kiosk-l.svg index b17f59291e..2a6610ea6f 100644 --- a/data/styles/clear/style-clear/symbols/kiosk-l.svg +++ b/data/styles/clear/style-clear/symbols/kiosk-l.svg @@ -1,19 +1,7 @@ - - - - kiosk-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/kiosk-m.svg b/data/styles/clear/style-clear/symbols/kiosk-m.svg index f0b7ef7656..89b4972cc0 100644 --- a/data/styles/clear/style-clear/symbols/kiosk-m.svg +++ b/data/styles/clear/style-clear/symbols/kiosk-m.svg @@ -1,19 +1,7 @@ - - - - kiosk-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/kiosk-s.svg b/data/styles/clear/style-clear/symbols/kiosk-s.svg new file mode 100644 index 0000000000..7149af5f33 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/kiosk-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/laundry-l.svg b/data/styles/clear/style-clear/symbols/laundry-l.svg index 5f9d4a5a85..737ab7ae14 100644 --- a/data/styles/clear/style-clear/symbols/laundry-l.svg +++ b/data/styles/clear/style-clear/symbols/laundry-l.svg @@ -1,23 +1,7 @@ - - - - laundry-l - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/laundry-m.svg b/data/styles/clear/style-clear/symbols/laundry-m.svg index 090a749b88..c2169b634d 100644 --- a/data/styles/clear/style-clear/symbols/laundry-m.svg +++ b/data/styles/clear/style-clear/symbols/laundry-m.svg @@ -1,23 +1,7 @@ - - - - laundry-m - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/laundry-s.svg b/data/styles/clear/style-clear/symbols/laundry-s.svg new file mode 100644 index 0000000000..c5b675c829 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/laundry-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/lawyer-l.svg b/data/styles/clear/style-clear/symbols/lawyer-l.svg index a49242c3d5..b1ff005605 100644 --- a/data/styles/clear/style-clear/symbols/lawyer-l.svg +++ b/data/styles/clear/style-clear/symbols/lawyer-l.svg @@ -1,25 +1,7 @@ - - - - lawyer-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/lawyer-m.svg b/data/styles/clear/style-clear/symbols/lawyer-m.svg new file mode 100644 index 0000000000..f97befae94 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/lawyer-m.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/lawyer-s.svg b/data/styles/clear/style-clear/symbols/lawyer-s.svg new file mode 100644 index 0000000000..a87d187ff0 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/lawyer-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/library-l.svg b/data/styles/clear/style-clear/symbols/library-l.svg index 84b1d3d289..a3aeb7123b 100644 --- a/data/styles/clear/style-clear/symbols/library-l.svg +++ b/data/styles/clear/style-clear/symbols/library-l.svg @@ -1,24 +1,7 @@ - - - - library-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/library-m.svg b/data/styles/clear/style-clear/symbols/library-m.svg index 6535f9d785..0f20202080 100644 --- a/data/styles/clear/style-clear/symbols/library-m.svg +++ b/data/styles/clear/style-clear/symbols/library-m.svg @@ -1,19 +1,7 @@ - - - - library-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/library-s.svg b/data/styles/clear/style-clear/symbols/library-s.svg index d80c0f816d..bb1cbee592 100644 --- a/data/styles/clear/style-clear/symbols/library-s.svg +++ b/data/styles/clear/style-clear/symbols/library-s.svg @@ -1,19 +1,7 @@ - - - - library-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/lift_gate-l.svg b/data/styles/clear/style-clear/symbols/lift_gate-l.svg index 6e66e8be98..ecfc0b273d 100644 --- a/data/styles/clear/style-clear/symbols/lift_gate-l.svg +++ b/data/styles/clear/style-clear/symbols/lift_gate-l.svg @@ -1,12 +1,6 @@ - - - - lift_gate-l - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/lift_gate-m.svg b/data/styles/clear/style-clear/symbols/lift_gate-m.svg index e9c27c2b5b..4b4806c925 100644 --- a/data/styles/clear/style-clear/symbols/lift_gate-m.svg +++ b/data/styles/clear/style-clear/symbols/lift_gate-m.svg @@ -1,12 +1,6 @@ - - - - lift_gate-m - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/lift_gate-s.svg b/data/styles/clear/style-clear/symbols/lift_gate-s.svg index 06bf976da5..b5f5d7fe02 100644 --- a/data/styles/clear/style-clear/symbols/lift_gate-s.svg +++ b/data/styles/clear/style-clear/symbols/lift_gate-s.svg @@ -1,12 +1,6 @@ - - - - lift_gate-s - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/lighthouse-l.svg b/data/styles/clear/style-clear/symbols/lighthouse-l.svg index 5864b92f54..7429aa5bf9 100644 --- a/data/styles/clear/style-clear/symbols/lighthouse-l.svg +++ b/data/styles/clear/style-clear/symbols/lighthouse-l.svg @@ -1,19 +1,7 @@ - - - - lighthouse-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/lighthouse-m.svg b/data/styles/clear/style-clear/symbols/lighthouse-m.svg index 76108c71c7..4ec3f514d0 100644 --- a/data/styles/clear/style-clear/symbols/lighthouse-m.svg +++ b/data/styles/clear/style-clear/symbols/lighthouse-m.svg @@ -1,19 +1,7 @@ - - - - lighthouse-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/lighthouse-s.svg b/data/styles/clear/style-clear/symbols/lighthouse-s.svg index d4dd6c48d7..9a0bb8587a 100644 --- a/data/styles/clear/style-clear/symbols/lighthouse-s.svg +++ b/data/styles/clear/style-clear/symbols/lighthouse-s.svg @@ -1,19 +1,7 @@ - - - - lighthouse-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/lightrail-berlin-l.svg b/data/styles/clear/style-clear/symbols/lightrail-berlin-l.svg index 97a8b820ef..9bdc61d8df 100644 --- a/data/styles/clear/style-clear/symbols/lightrail-berlin-l.svg +++ b/data/styles/clear/style-clear/symbols/lightrail-berlin-l.svg @@ -1,16 +1,9 @@ - - - - lightrail-berlin-l - Created with Sketch. - - - - - - - - - + + + + + + - \ No newline at end of file + + diff --git a/data/styles/clear/style-clear/symbols/lightrail-berlin-m.svg b/data/styles/clear/style-clear/symbols/lightrail-berlin-m.svg index ae81a7551e..7461644db9 100644 --- a/data/styles/clear/style-clear/symbols/lightrail-berlin-m.svg +++ b/data/styles/clear/style-clear/symbols/lightrail-berlin-m.svg @@ -1,16 +1,7 @@ - - - - lightrail-berlin-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/lightrail-berlin-s.svg b/data/styles/clear/style-clear/symbols/lightrail-berlin-s.svg index 7fe6743b0d..607c0d9cd9 100644 --- a/data/styles/clear/style-clear/symbols/lightrail-berlin-s.svg +++ b/data/styles/clear/style-clear/symbols/lightrail-berlin-s.svg @@ -1,16 +1,7 @@ - - - - lightrail-berlin-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/mail-l.svg b/data/styles/clear/style-clear/symbols/mail-l.svg index c7a1474561..11cee1e1ae 100644 --- a/data/styles/clear/style-clear/symbols/mail-l.svg +++ b/data/styles/clear/style-clear/symbols/mail-l.svg @@ -1,19 +1,7 @@ - - - - mail-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/mail-m.svg b/data/styles/clear/style-clear/symbols/mail-m.svg index 0077b184aa..26c64e6931 100644 --- a/data/styles/clear/style-clear/symbols/mail-m.svg +++ b/data/styles/clear/style-clear/symbols/mail-m.svg @@ -1,19 +1,7 @@ - - - - mail-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/mail-s.svg b/data/styles/clear/style-clear/symbols/mail-s.svg index 2ac3828c18..01bccf40f1 100644 --- a/data/styles/clear/style-clear/symbols/mail-s.svg +++ b/data/styles/clear/style-clear/symbols/mail-s.svg @@ -1,19 +1,7 @@ - - - - mail-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/marketplace-l.svg b/data/styles/clear/style-clear/symbols/marketplace-l.svg index 27ccd010ea..ea87ff0115 100644 --- a/data/styles/clear/style-clear/symbols/marketplace-l.svg +++ b/data/styles/clear/style-clear/symbols/marketplace-l.svg @@ -1,19 +1,7 @@ - - - - marketplace-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/marketplace-m.svg b/data/styles/clear/style-clear/symbols/marketplace-m.svg index 72a14bcabf..c4acba3a1f 100644 --- a/data/styles/clear/style-clear/symbols/marketplace-m.svg +++ b/data/styles/clear/style-clear/symbols/marketplace-m.svg @@ -1,19 +1,7 @@ - - - - marketplace-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/marketplace-s.svg b/data/styles/clear/style-clear/symbols/marketplace-s.svg index 51af4dd592..494b6ed737 100644 --- a/data/styles/clear/style-clear/symbols/marketplace-s.svg +++ b/data/styles/clear/style-clear/symbols/marketplace-s.svg @@ -1,19 +1,7 @@ - - - - marketplace-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/military-l.svg b/data/styles/clear/style-clear/symbols/military-l.svg index 0ba7316bae..54d3dde693 100644 --- a/data/styles/clear/style-clear/symbols/military-l.svg +++ b/data/styles/clear/style-clear/symbols/military-l.svg @@ -1,20 +1,7 @@ - - - - military-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/military-m.svg b/data/styles/clear/style-clear/symbols/military-m.svg index ae5b7d062e..6351b43354 100644 --- a/data/styles/clear/style-clear/symbols/military-m.svg +++ b/data/styles/clear/style-clear/symbols/military-m.svg @@ -1,19 +1,7 @@ - - - - military-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/military-s.svg b/data/styles/clear/style-clear/symbols/military-s.svg index ee03ba47de..643d24360e 100644 --- a/data/styles/clear/style-clear/symbols/military-s.svg +++ b/data/styles/clear/style-clear/symbols/military-s.svg @@ -1,19 +1,7 @@ - - - - military-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/mobile_phone-l.svg b/data/styles/clear/style-clear/symbols/mobile_phone-l.svg index ddf3e29f2b..af2b3dcdcf 100644 --- a/data/styles/clear/style-clear/symbols/mobile_phone-l.svg +++ b/data/styles/clear/style-clear/symbols/mobile_phone-l.svg @@ -1,19 +1,7 @@ - - - - mobile_phone-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/mobile_phone-m.svg b/data/styles/clear/style-clear/symbols/mobile_phone-m.svg index fa8df6dbb5..7b60568c89 100644 --- a/data/styles/clear/style-clear/symbols/mobile_phone-m.svg +++ b/data/styles/clear/style-clear/symbols/mobile_phone-m.svg @@ -1,19 +1,7 @@ - - - - mobile_phone-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/mobile_phone-s.svg b/data/styles/clear/style-clear/symbols/mobile_phone-s.svg index 0888b2cba1..5cda81ad06 100644 --- a/data/styles/clear/style-clear/symbols/mobile_phone-s.svg +++ b/data/styles/clear/style-clear/symbols/mobile_phone-s.svg @@ -1,19 +1,7 @@ - - - - mobile_phone-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/monument-l.svg b/data/styles/clear/style-clear/symbols/monument-l.svg index e56589ba7e..e8fe3d67b7 100644 --- a/data/styles/clear/style-clear/symbols/monument-l.svg +++ b/data/styles/clear/style-clear/symbols/monument-l.svg @@ -1,14 +1,7 @@ - - - - monument-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/monument-m.svg b/data/styles/clear/style-clear/symbols/monument-m.svg index ed0bd5f97e..7737d9d366 100644 --- a/data/styles/clear/style-clear/symbols/monument-m.svg +++ b/data/styles/clear/style-clear/symbols/monument-m.svg @@ -1,14 +1,7 @@ - - - - monument-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/monument-s.svg b/data/styles/clear/style-clear/symbols/monument-s.svg index 5a0c751757..4519f03590 100644 --- a/data/styles/clear/style-clear/symbols/monument-s.svg +++ b/data/styles/clear/style-clear/symbols/monument-s.svg @@ -1,14 +1,7 @@ - - - - monument-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/motel-l.svg b/data/styles/clear/style-clear/symbols/motel-l.svg index c2272c5f6a..ddb2d6c5c7 100644 --- a/data/styles/clear/style-clear/symbols/motel-l.svg +++ b/data/styles/clear/style-clear/symbols/motel-l.svg @@ -1,14 +1,7 @@ - - - - motel-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/motel-m.svg b/data/styles/clear/style-clear/symbols/motel-m.svg index 1c705c0a86..c1002a1d86 100644 --- a/data/styles/clear/style-clear/symbols/motel-m.svg +++ b/data/styles/clear/style-clear/symbols/motel-m.svg @@ -1,14 +1,7 @@ - - - - motel-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/motel-s.svg b/data/styles/clear/style-clear/symbols/motel-s.svg index 7088ec86d7..6265c5b3a5 100644 --- a/data/styles/clear/style-clear/symbols/motel-s.svg +++ b/data/styles/clear/style-clear/symbols/motel-s.svg @@ -1,14 +1,7 @@ - - - - motel-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/motorcycle_shop-l.svg b/data/styles/clear/style-clear/symbols/motorcycle_shop-l.svg index 4a8473469c..fc21e3da68 100644 --- a/data/styles/clear/style-clear/symbols/motorcycle_shop-l.svg +++ b/data/styles/clear/style-clear/symbols/motorcycle_shop-l.svg @@ -1,25 +1,7 @@ - - - - motorcycle_shop-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/motorcycle_shop-m.svg b/data/styles/clear/style-clear/symbols/motorcycle_shop-m.svg index d5a058088a..f25f351092 100644 --- a/data/styles/clear/style-clear/symbols/motorcycle_shop-m.svg +++ b/data/styles/clear/style-clear/symbols/motorcycle_shop-m.svg @@ -1,19 +1,7 @@ - - - - motorcycle_shop-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/motorcycle_shop-s.svg b/data/styles/clear/style-clear/symbols/motorcycle_shop-s.svg new file mode 100644 index 0000000000..1964b55199 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/motorcycle_shop-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/museum-l.svg b/data/styles/clear/style-clear/symbols/museum-l.svg index 7e27fd37a5..1b00b6f6f9 100644 --- a/data/styles/clear/style-clear/symbols/museum-l.svg +++ b/data/styles/clear/style-clear/symbols/museum-l.svg @@ -1,19 +1,7 @@ - - - - museum-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/museum-m.svg b/data/styles/clear/style-clear/symbols/museum-m.svg index 7e9b5d3477..12fbf3b711 100644 --- a/data/styles/clear/style-clear/symbols/museum-m.svg +++ b/data/styles/clear/style-clear/symbols/museum-m.svg @@ -1,19 +1,7 @@ - - - - museum-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/museum-s.svg b/data/styles/clear/style-clear/symbols/museum-s.svg index acb5c15562..829a3f2ab0 100644 --- a/data/styles/clear/style-clear/symbols/museum-s.svg +++ b/data/styles/clear/style-clear/symbols/museum-s.svg @@ -1,20 +1,7 @@ - - - - museum-s - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/muslim-l.svg b/data/styles/clear/style-clear/symbols/muslim-l.svg index 9739fe4ec4..5bc6baed34 100644 --- a/data/styles/clear/style-clear/symbols/muslim-l.svg +++ b/data/styles/clear/style-clear/symbols/muslim-l.svg @@ -1,17 +1,7 @@ - - - - muslim-l - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/muslim-m.svg b/data/styles/clear/style-clear/symbols/muslim-m.svg index 1994b9f05f..06a852c52b 100644 --- a/data/styles/clear/style-clear/symbols/muslim-m.svg +++ b/data/styles/clear/style-clear/symbols/muslim-m.svg @@ -1,18 +1,7 @@ - - - - muslim-m - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/muslim-s.svg b/data/styles/clear/style-clear/symbols/muslim-s.svg index 67ec5c3dfc..45ab51b670 100644 --- a/data/styles/clear/style-clear/symbols/muslim-s.svg +++ b/data/styles/clear/style-clear/symbols/muslim-s.svg @@ -1,17 +1,7 @@ - - - - muslim-s - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/no-icon-amenity.svg b/data/styles/clear/style-clear/symbols/no-icon-amenity.svg deleted file mode 100644 index 5ca721f491..0000000000 --- a/data/styles/clear/style-clear/symbols/no-icon-amenity.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - no-icon-amenity - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/no-icon-leisure.svg b/data/styles/clear/style-clear/symbols/no-icon-leisure.svg deleted file mode 100644 index 1219ecf8f0..0000000000 --- a/data/styles/clear/style-clear/symbols/no-icon-leisure.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - no-icon-leisure - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/no-icon-shop.svg b/data/styles/clear/style-clear/symbols/no-icon-shop.svg deleted file mode 100644 index ae2a4df421..0000000000 --- a/data/styles/clear/style-clear/symbols/no-icon-shop.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - no-icon-shop - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/no-icon-tourism.svg b/data/styles/clear/style-clear/symbols/no-icon-tourism.svg deleted file mode 100644 index 56bc57c121..0000000000 --- a/data/styles/clear/style-clear/symbols/no-icon-tourism.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - no-icon-tourism - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/no-icon.svg b/data/styles/clear/style-clear/symbols/no-icon.svg deleted file mode 100644 index 26ad9b7d75..0000000000 --- a/data/styles/clear/style-clear/symbols/no-icon.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - no-icon - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/none.svg b/data/styles/clear/style-clear/symbols/none.svg deleted file mode 100644 index 07bf72d5f2..0000000000 --- a/data/styles/clear/style-clear/symbols/none.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - none - Created with Sketch. - - - \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/npark-l.svg b/data/styles/clear/style-clear/symbols/npark-l.svg index 549090a5c7..c094fbe735 100644 --- a/data/styles/clear/style-clear/symbols/npark-l.svg +++ b/data/styles/clear/style-clear/symbols/npark-l.svg @@ -1,16 +1,7 @@ - - - - npark-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/npark-m.svg b/data/styles/clear/style-clear/symbols/npark-m.svg index b61a0e9f36..b8f3f64807 100644 --- a/data/styles/clear/style-clear/symbols/npark-m.svg +++ b/data/styles/clear/style-clear/symbols/npark-m.svg @@ -1,18 +1,7 @@ - - - - npark-m - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/npark-s.svg b/data/styles/clear/style-clear/symbols/npark-s.svg index 30b7051265..49989e6775 100644 --- a/data/styles/clear/style-clear/symbols/npark-s.svg +++ b/data/styles/clear/style-clear/symbols/npark-s.svg @@ -1,16 +1,7 @@ - - - - npark-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/nparkF-l.svg b/data/styles/clear/style-clear/symbols/nparkF-l.svg index e84cc69c39..dac52c4418 100644 --- a/data/styles/clear/style-clear/symbols/nparkF-l.svg +++ b/data/styles/clear/style-clear/symbols/nparkF-l.svg @@ -1,16 +1,7 @@ - - - - nparkF-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/nparkF-m.svg b/data/styles/clear/style-clear/symbols/nparkF-m.svg index 6fe6750b85..4e818c0e93 100644 --- a/data/styles/clear/style-clear/symbols/nparkF-m.svg +++ b/data/styles/clear/style-clear/symbols/nparkF-m.svg @@ -1,16 +1,7 @@ - - - - nparkF-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/nparkF-s.svg b/data/styles/clear/style-clear/symbols/nparkF-s.svg index 9fc9ec0103..6f7cb7ad56 100644 --- a/data/styles/clear/style-clear/symbols/nparkF-s.svg +++ b/data/styles/clear/style-clear/symbols/nparkF-s.svg @@ -1,16 +1,7 @@ - - - - nparkF-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/office-l.svg b/data/styles/clear/style-clear/symbols/office-l.svg index ce39817d6e..648d99afb7 100644 --- a/data/styles/clear/style-clear/symbols/office-l.svg +++ b/data/styles/clear/style-clear/symbols/office-l.svg @@ -1,19 +1,7 @@ - - - - office-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/office-m.svg b/data/styles/clear/style-clear/symbols/office-m.svg index 9342be7a1c..965280b25a 100644 --- a/data/styles/clear/style-clear/symbols/office-m.svg +++ b/data/styles/clear/style-clear/symbols/office-m.svg @@ -1,19 +1,7 @@ - - - - office-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/office-s.svg b/data/styles/clear/style-clear/symbols/office-s.svg index d3e1eca7a1..e99eb9afce 100644 --- a/data/styles/clear/style-clear/symbols/office-s.svg +++ b/data/styles/clear/style-clear/symbols/office-s.svg @@ -1,19 +1,7 @@ - - - - office-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/optician-l.svg b/data/styles/clear/style-clear/symbols/optician-l.svg index 8fe50dcf73..825d7cd3ce 100644 --- a/data/styles/clear/style-clear/symbols/optician-l.svg +++ b/data/styles/clear/style-clear/symbols/optician-l.svg @@ -1,19 +1,7 @@ - - - - optician-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/optician-m.svg b/data/styles/clear/style-clear/symbols/optician-m.svg index 4f59a046ef..127ac1b0fe 100644 --- a/data/styles/clear/style-clear/symbols/optician-m.svg +++ b/data/styles/clear/style-clear/symbols/optician-m.svg @@ -1,19 +1,7 @@ - - - - optician-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/optician-s.svg b/data/styles/clear/style-clear/symbols/optician-s.svg index f7ee3a83dd..8c3e174c7f 100644 --- a/data/styles/clear/style-clear/symbols/optician-s.svg +++ b/data/styles/clear/style-clear/symbols/optician-s.svg @@ -1,19 +1,7 @@ - - - - optician-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/outdoor-shop-l.svg b/data/styles/clear/style-clear/symbols/outdoor-shop-l.svg index 31b3572e71..6339127046 100644 --- a/data/styles/clear/style-clear/symbols/outdoor-shop-l.svg +++ b/data/styles/clear/style-clear/symbols/outdoor-shop-l.svg @@ -1,25 +1,7 @@ - - - - outdoor-shop-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/outdoor-shop-m.svg b/data/styles/clear/style-clear/symbols/outdoor-shop-m.svg index 1f09d8dea9..4d88e2b933 100644 --- a/data/styles/clear/style-clear/symbols/outdoor-shop-m.svg +++ b/data/styles/clear/style-clear/symbols/outdoor-shop-m.svg @@ -1,19 +1,7 @@ - - - - outdoor-shop-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/outdoor-shop-s.svg b/data/styles/clear/style-clear/symbols/outdoor-shop-s.svg new file mode 100644 index 0000000000..f75d8b05c1 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/outdoor-shop-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/park-l.svg b/data/styles/clear/style-clear/symbols/park-l.svg index 4d7c28d881..77d69bf94d 100644 --- a/data/styles/clear/style-clear/symbols/park-l.svg +++ b/data/styles/clear/style-clear/symbols/park-l.svg @@ -1,16 +1,7 @@ - - - - park-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/park-m.svg b/data/styles/clear/style-clear/symbols/park-m.svg index 8464c8ac35..efb567f931 100644 --- a/data/styles/clear/style-clear/symbols/park-m.svg +++ b/data/styles/clear/style-clear/symbols/park-m.svg @@ -1,16 +1,7 @@ - - - - park-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/park-s.svg b/data/styles/clear/style-clear/symbols/park-s.svg index 4012074c50..06d4e68064 100644 --- a/data/styles/clear/style-clear/symbols/park-s.svg +++ b/data/styles/clear/style-clear/symbols/park-s.svg @@ -1,16 +1,7 @@ - - - - park-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/parking-l.svg b/data/styles/clear/style-clear/symbols/parking-l.svg index 0031c1f5a5..a42739b02b 100644 --- a/data/styles/clear/style-clear/symbols/parking-l.svg +++ b/data/styles/clear/style-clear/symbols/parking-l.svg @@ -1,14 +1,7 @@ - - - - parking-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/parking-m.svg b/data/styles/clear/style-clear/symbols/parking-m.svg index fc84ccea44..f3df38d6a4 100644 --- a/data/styles/clear/style-clear/symbols/parking-m.svg +++ b/data/styles/clear/style-clear/symbols/parking-m.svg @@ -1,14 +1,7 @@ - - - - parking-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/parking-meter-l.svg b/data/styles/clear/style-clear/symbols/parking-meter-l.svg index df6febc707..1fea51bf06 100644 --- a/data/styles/clear/style-clear/symbols/parking-meter-l.svg +++ b/data/styles/clear/style-clear/symbols/parking-meter-l.svg @@ -1,12 +1,6 @@ - - - - parking-meter-l - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/parking-meter-m.svg b/data/styles/clear/style-clear/symbols/parking-meter-m.svg index c4053f1ffa..a922626834 100644 --- a/data/styles/clear/style-clear/symbols/parking-meter-m.svg +++ b/data/styles/clear/style-clear/symbols/parking-meter-m.svg @@ -1,12 +1,6 @@ - - - - parking-meter-m - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/parking-meter-s.svg b/data/styles/clear/style-clear/symbols/parking-meter-s.svg index e6b6737b1d..b7cb0d12c5 100644 --- a/data/styles/clear/style-clear/symbols/parking-meter-s.svg +++ b/data/styles/clear/style-clear/symbols/parking-meter-s.svg @@ -1,13 +1,6 @@ - - - - parking-meter-s - Created with Sketch. - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/parking-s.svg b/data/styles/clear/style-clear/symbols/parking-s.svg index ae3c3b42f4..1f3291fbd4 100644 --- a/data/styles/clear/style-clear/symbols/parking-s.svg +++ b/data/styles/clear/style-clear/symbols/parking-s.svg @@ -1,14 +1,7 @@ - - - - parking-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/parking_pay-l.svg b/data/styles/clear/style-clear/symbols/parking_pay-l.svg index 103d9fda20..3c416747d9 100644 --- a/data/styles/clear/style-clear/symbols/parking_pay-l.svg +++ b/data/styles/clear/style-clear/symbols/parking_pay-l.svg @@ -1,16 +1,7 @@ - - - - parking_pay-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/parking_pay-m.svg b/data/styles/clear/style-clear/symbols/parking_pay-m.svg index 32d8c3cf06..7ede632253 100644 --- a/data/styles/clear/style-clear/symbols/parking_pay-m.svg +++ b/data/styles/clear/style-clear/symbols/parking_pay-m.svg @@ -1,16 +1,7 @@ - - - - parking_pay-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/parking_pay-s.svg b/data/styles/clear/style-clear/symbols/parking_pay-s.svg index f1485354f1..2fbfffc0e9 100644 --- a/data/styles/clear/style-clear/symbols/parking_pay-s.svg +++ b/data/styles/clear/style-clear/symbols/parking_pay-s.svg @@ -1,15 +1,7 @@ - - - - parking_pay-s - Created with Sketch. - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/peak-l.svg b/data/styles/clear/style-clear/symbols/peak-l.svg deleted file mode 100644 index 3cb96ab3eb..0000000000 --- a/data/styles/clear/style-clear/symbols/peak-l.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - peak-l - Created with Sketch. - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/peak-m.svg b/data/styles/clear/style-clear/symbols/peak-m.svg deleted file mode 100644 index 55c5bb1efb..0000000000 --- a/data/styles/clear/style-clear/symbols/peak-m.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - peak-m - Created with Sketch. - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/peak-s.svg b/data/styles/clear/style-clear/symbols/peak-s.svg deleted file mode 100644 index 552e8bd49a..0000000000 --- a/data/styles/clear/style-clear/symbols/peak-s.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - peak-s - Created with Sketch. - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/peakt-l.svg b/data/styles/clear/style-clear/symbols/peakt-l.svg index 03eb35736d..935dd57a7d 100644 --- a/data/styles/clear/style-clear/symbols/peakt-l.svg +++ b/data/styles/clear/style-clear/symbols/peakt-l.svg @@ -1,10 +1,3 @@ - - - - peakt-l - Created with Sketch. - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-clear/symbols/peakt-m.svg b/data/styles/clear/style-clear/symbols/peakt-m.svg index 634f415184..5a340e2ac4 100644 --- a/data/styles/clear/style-clear/symbols/peakt-m.svg +++ b/data/styles/clear/style-clear/symbols/peakt-m.svg @@ -1,10 +1,3 @@ - - - - peakt-m - Created with Sketch. - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-clear/symbols/peakt-s.svg b/data/styles/clear/style-clear/symbols/peakt-s.svg index 3273221148..a4d562b604 100644 --- a/data/styles/clear/style-clear/symbols/peakt-s.svg +++ b/data/styles/clear/style-clear/symbols/peakt-s.svg @@ -1,10 +1,3 @@ - - - - peakt-s - Created with Sketch. - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-clear/symbols/petshop-l.svg b/data/styles/clear/style-clear/symbols/petshop-l.svg index dff416f8eb..03047742be 100644 --- a/data/styles/clear/style-clear/symbols/petshop-l.svg +++ b/data/styles/clear/style-clear/symbols/petshop-l.svg @@ -1,25 +1,7 @@ - - - - petshop-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/petshop-m.svg b/data/styles/clear/style-clear/symbols/petshop-m.svg index beed3adb42..f9d75c70f7 100644 --- a/data/styles/clear/style-clear/symbols/petshop-m.svg +++ b/data/styles/clear/style-clear/symbols/petshop-m.svg @@ -1,19 +1,7 @@ - - - - petshop-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/petshop-s.svg b/data/styles/clear/style-clear/symbols/petshop-s.svg new file mode 100644 index 0000000000..bdeb6c2a6e --- /dev/null +++ b/data/styles/clear/style-clear/symbols/petshop-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/pharmacy-l.svg b/data/styles/clear/style-clear/symbols/pharmacy-l.svg index 4763a50d22..123b60ece6 100644 --- a/data/styles/clear/style-clear/symbols/pharmacy-l.svg +++ b/data/styles/clear/style-clear/symbols/pharmacy-l.svg @@ -1,16 +1,7 @@ - - - - pharmacy-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/pharmacy-m.svg b/data/styles/clear/style-clear/symbols/pharmacy-m.svg index 5942166ffe..78b0d6686c 100644 --- a/data/styles/clear/style-clear/symbols/pharmacy-m.svg +++ b/data/styles/clear/style-clear/symbols/pharmacy-m.svg @@ -1,16 +1,7 @@ - - - - pharmacy-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/pharmacy-s.svg b/data/styles/clear/style-clear/symbols/pharmacy-s.svg index 8539df9fc3..0ef39d55d2 100644 --- a/data/styles/clear/style-clear/symbols/pharmacy-s.svg +++ b/data/styles/clear/style-clear/symbols/pharmacy-s.svg @@ -1,16 +1,7 @@ - - - - pharmacy-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/phone-l.svg b/data/styles/clear/style-clear/symbols/phone-l.svg index 76615b268b..93ff6d1dc7 100644 --- a/data/styles/clear/style-clear/symbols/phone-l.svg +++ b/data/styles/clear/style-clear/symbols/phone-l.svg @@ -1,12 +1,6 @@ - - - - phone-l - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/phone-m.svg b/data/styles/clear/style-clear/symbols/phone-m.svg index eb74768dca..90b4215ee5 100644 --- a/data/styles/clear/style-clear/symbols/phone-m.svg +++ b/data/styles/clear/style-clear/symbols/phone-m.svg @@ -1,12 +1,6 @@ - - - - phone-m - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/phone-s.svg b/data/styles/clear/style-clear/symbols/phone-s.svg index 5a7a127f61..de43975e22 100644 --- a/data/styles/clear/style-clear/symbols/phone-s.svg +++ b/data/styles/clear/style-clear/symbols/phone-s.svg @@ -1,12 +1,6 @@ - - - - phone-s - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/photo-shop-l.svg b/data/styles/clear/style-clear/symbols/photo-shop-l.svg index a310eec466..9aa8ba30b0 100644 --- a/data/styles/clear/style-clear/symbols/photo-shop-l.svg +++ b/data/styles/clear/style-clear/symbols/photo-shop-l.svg @@ -1,27 +1,7 @@ - - - - photo-shop-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/photo-shop-m.svg b/data/styles/clear/style-clear/symbols/photo-shop-m.svg index e160f6f36b..19ff6af748 100644 --- a/data/styles/clear/style-clear/symbols/photo-shop-m.svg +++ b/data/styles/clear/style-clear/symbols/photo-shop-m.svg @@ -1,25 +1,7 @@ - - - - photo-shop-m - Created with Sketch. - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/photo-shop-s.svg b/data/styles/clear/style-clear/symbols/photo-shop-s.svg index 269a5a8856..c63c5fa69d 100644 --- a/data/styles/clear/style-clear/symbols/photo-shop-s.svg +++ b/data/styles/clear/style-clear/symbols/photo-shop-s.svg @@ -1,29 +1,7 @@ - - - - photo-shop-s - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/picnic-l.svg b/data/styles/clear/style-clear/symbols/picnic-l.svg index e1726a06b2..5a2fdf3d1f 100644 --- a/data/styles/clear/style-clear/symbols/picnic-l.svg +++ b/data/styles/clear/style-clear/symbols/picnic-l.svg @@ -1,19 +1,7 @@ - - - - picnic-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/picnic-m.svg b/data/styles/clear/style-clear/symbols/picnic-m.svg index 173ef4ac64..3a2034d385 100644 --- a/data/styles/clear/style-clear/symbols/picnic-m.svg +++ b/data/styles/clear/style-clear/symbols/picnic-m.svg @@ -1,19 +1,7 @@ - - - - picnic-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/picnic-s.svg b/data/styles/clear/style-clear/symbols/picnic-s.svg index fc39ffbb52..1a3cf15467 100644 --- a/data/styles/clear/style-clear/symbols/picnic-s.svg +++ b/data/styles/clear/style-clear/symbols/picnic-s.svg @@ -1,19 +1,7 @@ - - - - picnic-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/pitch-l.svg b/data/styles/clear/style-clear/symbols/pitch-l.svg index c2ec515b03..021c0038a5 100644 --- a/data/styles/clear/style-clear/symbols/pitch-l.svg +++ b/data/styles/clear/style-clear/symbols/pitch-l.svg @@ -1,19 +1,7 @@ - - - - pitch-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/pitch-m.svg b/data/styles/clear/style-clear/symbols/pitch-m.svg index dd6e4f1d8a..b18a65a155 100644 --- a/data/styles/clear/style-clear/symbols/pitch-m.svg +++ b/data/styles/clear/style-clear/symbols/pitch-m.svg @@ -1,19 +1,7 @@ - - - - pitch-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/pitch-s.svg b/data/styles/clear/style-clear/symbols/pitch-s.svg index 794410069a..458afbfdf1 100644 --- a/data/styles/clear/style-clear/symbols/pitch-s.svg +++ b/data/styles/clear/style-clear/symbols/pitch-s.svg @@ -1,19 +1,7 @@ - - - - pitch-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/place-of-worship-l.svg b/data/styles/clear/style-clear/symbols/place-of-worship-l.svg index be489b5dec..8826a2abed 100644 --- a/data/styles/clear/style-clear/symbols/place-of-worship-l.svg +++ b/data/styles/clear/style-clear/symbols/place-of-worship-l.svg @@ -1,21 +1,7 @@ - - - - place-of-worship-l - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/place-of-worship-m.svg b/data/styles/clear/style-clear/symbols/place-of-worship-m.svg index 7c79fe2002..4563862d1e 100644 --- a/data/styles/clear/style-clear/symbols/place-of-worship-m.svg +++ b/data/styles/clear/style-clear/symbols/place-of-worship-m.svg @@ -1,21 +1,7 @@ - - - - place-of-worship-m - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/place-of-worship-s.svg b/data/styles/clear/style-clear/symbols/place-of-worship-s.svg index e877d68281..1e22243df0 100644 --- a/data/styles/clear/style-clear/symbols/place-of-worship-s.svg +++ b/data/styles/clear/style-clear/symbols/place-of-worship-s.svg @@ -1,21 +1,7 @@ - - - - place-of-worship-s - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/police-l.svg b/data/styles/clear/style-clear/symbols/police-l.svg index 85bc18f9a1..01079fdc1b 100644 --- a/data/styles/clear/style-clear/symbols/police-l.svg +++ b/data/styles/clear/style-clear/symbols/police-l.svg @@ -1,19 +1,7 @@ - - - - police-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/police-m.svg b/data/styles/clear/style-clear/symbols/police-m.svg index 990ffa0c43..79b03f213f 100644 --- a/data/styles/clear/style-clear/symbols/police-m.svg +++ b/data/styles/clear/style-clear/symbols/police-m.svg @@ -1,23 +1,7 @@ - - - - police-m - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/police-s.svg b/data/styles/clear/style-clear/symbols/police-s.svg index 01079a046f..68564534eb 100644 --- a/data/styles/clear/style-clear/symbols/police-s.svg +++ b/data/styles/clear/style-clear/symbols/police-s.svg @@ -1,19 +1,7 @@ - - - - police-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/postbox-l.svg b/data/styles/clear/style-clear/symbols/postbox-l.svg index 14331a3e2a..391749744d 100644 --- a/data/styles/clear/style-clear/symbols/postbox-l.svg +++ b/data/styles/clear/style-clear/symbols/postbox-l.svg @@ -1,12 +1,6 @@ - - - - postbox-l - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/postbox-m.svg b/data/styles/clear/style-clear/symbols/postbox-m.svg index df90f92f13..fc87d648ef 100644 --- a/data/styles/clear/style-clear/symbols/postbox-m.svg +++ b/data/styles/clear/style-clear/symbols/postbox-m.svg @@ -1,12 +1,6 @@ - - - - postbox-m - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/postbox-s.svg b/data/styles/clear/style-clear/symbols/postbox-s.svg index 71403c0b10..4c082efa21 100644 --- a/data/styles/clear/style-clear/symbols/postbox-s.svg +++ b/data/styles/clear/style-clear/symbols/postbox-s.svg @@ -1,12 +1,6 @@ - - - - postbox-s - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/power-l.svg b/data/styles/clear/style-clear/symbols/power-l.svg index f71cab8be9..52a477c3e1 100644 --- a/data/styles/clear/style-clear/symbols/power-l.svg +++ b/data/styles/clear/style-clear/symbols/power-l.svg @@ -1,19 +1,7 @@ - - - - power-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/power-m.svg b/data/styles/clear/style-clear/symbols/power-m.svg index 68b43b2165..53f7c5cfb4 100644 --- a/data/styles/clear/style-clear/symbols/power-m.svg +++ b/data/styles/clear/style-clear/symbols/power-m.svg @@ -1,19 +1,7 @@ - - - - power-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/power-s.svg b/data/styles/clear/style-clear/symbols/power-s.svg new file mode 100644 index 0000000000..7e9441219e --- /dev/null +++ b/data/styles/clear/style-clear/symbols/power-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/public-building-l.svg b/data/styles/clear/style-clear/symbols/public-building-l.svg index 1c766dbb59..bb1d3227b5 100644 --- a/data/styles/clear/style-clear/symbols/public-building-l.svg +++ b/data/styles/clear/style-clear/symbols/public-building-l.svg @@ -1,14 +1,7 @@ - - - - public-building-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/public-building-m.svg b/data/styles/clear/style-clear/symbols/public-building-m.svg index 3ff6871f0b..e2ee07b4c4 100644 --- a/data/styles/clear/style-clear/symbols/public-building-m.svg +++ b/data/styles/clear/style-clear/symbols/public-building-m.svg @@ -1,14 +1,7 @@ - - - - public-building-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/public-building-s.svg b/data/styles/clear/style-clear/symbols/public-building-s.svg index 63a1449d68..4052d6b554 100644 --- a/data/styles/clear/style-clear/symbols/public-building-s.svg +++ b/data/styles/clear/style-clear/symbols/public-building-s.svg @@ -1,14 +1,7 @@ - - - - public-building-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/railway-crossing-l.svg b/data/styles/clear/style-clear/symbols/railway-crossing-l.svg new file mode 100644 index 0000000000..bf46a6150a --- /dev/null +++ b/data/styles/clear/style-clear/symbols/railway-crossing-l.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/railway-crossing_xl.svg b/data/styles/clear/style-clear/symbols/railway-crossing-xl.svg similarity index 100% rename from data/styles/clear/style-clear/symbols/railway-crossing_xl.svg rename to data/styles/clear/style-clear/symbols/railway-crossing-xl.svg diff --git a/data/styles/clear/style-clear/symbols/railway-crossing.svg b/data/styles/clear/style-clear/symbols/railway-crossing.svg index e047851deb..a5165dc5ff 100644 --- a/data/styles/clear/style-clear/symbols/railway-crossing.svg +++ b/data/styles/clear/style-clear/symbols/railway-crossing.svg @@ -1,13 +1,10 @@ - - - - railway-crossing - Created with Sketch. - - - - - - - - \ No newline at end of file + + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/railway-crossing_l.svg b/data/styles/clear/style-clear/symbols/railway-crossing_l.svg deleted file mode 100644 index a6d56d5bac..0000000000 --- a/data/styles/clear/style-clear/symbols/railway-crossing_l.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - -railway-crossing -Created with Sketch. - - - diff --git a/data/styles/clear/style-clear/symbols/recycling-l.svg b/data/styles/clear/style-clear/symbols/recycling-l.svg index 3fc1f24ba0..9dae17017b 100644 --- a/data/styles/clear/style-clear/symbols/recycling-l.svg +++ b/data/styles/clear/style-clear/symbols/recycling-l.svg @@ -1,12 +1,6 @@ - - - - recycling-l - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/recycling-m.svg b/data/styles/clear/style-clear/symbols/recycling-m.svg index 18426d70aa..f316c96022 100644 --- a/data/styles/clear/style-clear/symbols/recycling-m.svg +++ b/data/styles/clear/style-clear/symbols/recycling-m.svg @@ -1,12 +1,6 @@ - - - - recycling-m - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/recycling-s.svg b/data/styles/clear/style-clear/symbols/recycling-s.svg index 0db7292511..879b972d69 100644 --- a/data/styles/clear/style-clear/symbols/recycling-s.svg +++ b/data/styles/clear/style-clear/symbols/recycling-s.svg @@ -1,12 +1,6 @@ - - - - recycling-s - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/remains-l.svg b/data/styles/clear/style-clear/symbols/remains-l.svg index 1c241a6ad3..b59f955d7f 100644 --- a/data/styles/clear/style-clear/symbols/remains-l.svg +++ b/data/styles/clear/style-clear/symbols/remains-l.svg @@ -1,23 +1,7 @@ - - - - remains-l - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/remains-m.svg b/data/styles/clear/style-clear/symbols/remains-m.svg index 28602a7d06..4a261717df 100644 --- a/data/styles/clear/style-clear/symbols/remains-m.svg +++ b/data/styles/clear/style-clear/symbols/remains-m.svg @@ -1,19 +1,7 @@ - - - - remains-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/remains-s.svg b/data/styles/clear/style-clear/symbols/remains-s.svg index 56a25adbbe..9afb316018 100644 --- a/data/styles/clear/style-clear/symbols/remains-s.svg +++ b/data/styles/clear/style-clear/symbols/remains-s.svg @@ -1,18 +1,7 @@ - - - - remains-s - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/restaurant-l.svg b/data/styles/clear/style-clear/symbols/restaurant-l.svg index c037b3cfb9..14cbea1ebd 100644 --- a/data/styles/clear/style-clear/symbols/restaurant-l.svg +++ b/data/styles/clear/style-clear/symbols/restaurant-l.svg @@ -1,21 +1,7 @@ - - - - restaurant-l - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/restaurant-m.svg b/data/styles/clear/style-clear/symbols/restaurant-m.svg index f3e6352d5e..62fa5399b1 100644 --- a/data/styles/clear/style-clear/symbols/restaurant-m.svg +++ b/data/styles/clear/style-clear/symbols/restaurant-m.svg @@ -1,21 +1,7 @@ - - - - restaurant-m - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/restaurant-s.svg b/data/styles/clear/style-clear/symbols/restaurant-s.svg index f14b9daf3c..afe8b5dce6 100644 --- a/data/styles/clear/style-clear/symbols/restaurant-s.svg +++ b/data/styles/clear/style-clear/symbols/restaurant-s.svg @@ -1,21 +1,7 @@ - - - - restaurant-s - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/s-arrow.svg b/data/styles/clear/style-clear/symbols/s-arrow.svg deleted file mode 100644 index 6b44995dbe..0000000000 --- a/data/styles/clear/style-clear/symbols/s-arrow.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - s-arrow - Created with Sketch. - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/sauna-l.svg b/data/styles/clear/style-clear/symbols/sauna-l.svg index 6af3036496..e2914d4064 100644 --- a/data/styles/clear/style-clear/symbols/sauna-l.svg +++ b/data/styles/clear/style-clear/symbols/sauna-l.svg @@ -1,25 +1,7 @@ - - - - sauna-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/sauna-m.svg b/data/styles/clear/style-clear/symbols/sauna-m.svg index f7903c310e..8f5724f726 100644 --- a/data/styles/clear/style-clear/symbols/sauna-m.svg +++ b/data/styles/clear/style-clear/symbols/sauna-m.svg @@ -1,19 +1,7 @@ - - - - sauna-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/sauna-s.svg b/data/styles/clear/style-clear/symbols/sauna-s.svg new file mode 100644 index 0000000000..2dfebf9070 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/sauna-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/school-l.svg b/data/styles/clear/style-clear/symbols/school-l.svg index 22ff7ed171..4ea17fa352 100644 --- a/data/styles/clear/style-clear/symbols/school-l.svg +++ b/data/styles/clear/style-clear/symbols/school-l.svg @@ -1,19 +1,7 @@ - - - - school-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/school-m.svg b/data/styles/clear/style-clear/symbols/school-m.svg index fe25ba5639..5c92d5c9ea 100644 --- a/data/styles/clear/style-clear/symbols/school-m.svg +++ b/data/styles/clear/style-clear/symbols/school-m.svg @@ -1,19 +1,7 @@ - - - - school-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/school-s.svg b/data/styles/clear/style-clear/symbols/school-s.svg index 052e660923..079e93b5d4 100644 --- a/data/styles/clear/style-clear/symbols/school-s.svg +++ b/data/styles/clear/style-clear/symbols/school-s.svg @@ -1,19 +1,7 @@ - - - - school-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/seafood-shop-l.svg b/data/styles/clear/style-clear/symbols/seafood-shop-l.svg index 4a923ae446..c86297c348 100644 --- a/data/styles/clear/style-clear/symbols/seafood-shop-l.svg +++ b/data/styles/clear/style-clear/symbols/seafood-shop-l.svg @@ -1,25 +1,7 @@ - - - - seafood-shop-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/seafood-shop-m.svg b/data/styles/clear/style-clear/symbols/seafood-shop-m.svg index 59e8e0f48d..c83d7ee954 100644 --- a/data/styles/clear/style-clear/symbols/seafood-shop-m.svg +++ b/data/styles/clear/style-clear/symbols/seafood-shop-m.svg @@ -1,25 +1,7 @@ - - - - seafood-shop-m - Created with Sketch. - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/seafood-shop-s.svg b/data/styles/clear/style-clear/symbols/seafood-shop-s.svg new file mode 100644 index 0000000000..0c9908f6e9 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/seafood-shop-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/shinto-l.svg b/data/styles/clear/style-clear/symbols/shinto-l.svg index bffa182db6..796c1bd217 100644 --- a/data/styles/clear/style-clear/symbols/shinto-l.svg +++ b/data/styles/clear/style-clear/symbols/shinto-l.svg @@ -1,16 +1,7 @@ - - - - shinto-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/shinto-m.svg b/data/styles/clear/style-clear/symbols/shinto-m.svg index c3f0c5807d..0ffe93e66b 100644 --- a/data/styles/clear/style-clear/symbols/shinto-m.svg +++ b/data/styles/clear/style-clear/symbols/shinto-m.svg @@ -1,16 +1,7 @@ - - - - shinto-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/shinto-s.svg b/data/styles/clear/style-clear/symbols/shinto-s.svg index 643edd4b30..8697ba65c8 100644 --- a/data/styles/clear/style-clear/symbols/shinto-s.svg +++ b/data/styles/clear/style-clear/symbols/shinto-s.svg @@ -1,16 +1,7 @@ - - - - shinto-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/ship-l.svg b/data/styles/clear/style-clear/symbols/ship-l.svg index 17acd5ddc1..5af1ddb724 100644 --- a/data/styles/clear/style-clear/symbols/ship-l.svg +++ b/data/styles/clear/style-clear/symbols/ship-l.svg @@ -1,23 +1,7 @@ - - - - ship-l - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/ship-m.svg b/data/styles/clear/style-clear/symbols/ship-m.svg index 2f7a00715b..c98f15fd4c 100644 --- a/data/styles/clear/style-clear/symbols/ship-m.svg +++ b/data/styles/clear/style-clear/symbols/ship-m.svg @@ -1,23 +1,7 @@ - - - - ship-m - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/ship-s.svg b/data/styles/clear/style-clear/symbols/ship-s.svg index a852c771a0..72b1e7afb2 100644 --- a/data/styles/clear/style-clear/symbols/ship-s.svg +++ b/data/styles/clear/style-clear/symbols/ship-s.svg @@ -1,23 +1,7 @@ - - - - ship-s - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/shoes-l.svg b/data/styles/clear/style-clear/symbols/shoes-l.svg index db08c6ed6b..63e3f5abfe 100644 --- a/data/styles/clear/style-clear/symbols/shoes-l.svg +++ b/data/styles/clear/style-clear/symbols/shoes-l.svg @@ -1,19 +1,7 @@ - - - - shoes-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/shoes-m.svg b/data/styles/clear/style-clear/symbols/shoes-m.svg index f07dc1489d..fe6d2d13c5 100644 --- a/data/styles/clear/style-clear/symbols/shoes-m.svg +++ b/data/styles/clear/style-clear/symbols/shoes-m.svg @@ -1,19 +1,7 @@ - - - - shoes-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/shoes-s.svg b/data/styles/clear/style-clear/symbols/shoes-s.svg index 5928daeacd..e3b4d0c217 100644 --- a/data/styles/clear/style-clear/symbols/shoes-s.svg +++ b/data/styles/clear/style-clear/symbols/shoes-s.svg @@ -1,19 +1,7 @@ - - - - shoes-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/shop-bicycle-l.svg b/data/styles/clear/style-clear/symbols/shop-bicycle-l.svg index 4db175af5f..84bf5c78e4 100644 --- a/data/styles/clear/style-clear/symbols/shop-bicycle-l.svg +++ b/data/styles/clear/style-clear/symbols/shop-bicycle-l.svg @@ -1,19 +1,7 @@ - - - - shop-bicycle-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/shop-bicycle-m.svg b/data/styles/clear/style-clear/symbols/shop-bicycle-m.svg index 63cbe0718b..54898cfbaa 100644 --- a/data/styles/clear/style-clear/symbols/shop-bicycle-m.svg +++ b/data/styles/clear/style-clear/symbols/shop-bicycle-m.svg @@ -1,19 +1,7 @@ - - - - shop-bicycle-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/shop-bicycle-s.svg b/data/styles/clear/style-clear/symbols/shop-bicycle-s.svg index 6babcdf325..e4c3b76a05 100644 --- a/data/styles/clear/style-clear/symbols/shop-bicycle-s.svg +++ b/data/styles/clear/style-clear/symbols/shop-bicycle-s.svg @@ -1,19 +1,7 @@ - - - - shop-bicycle-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/shop-l.svg b/data/styles/clear/style-clear/symbols/shop-l.svg index 5ff89ca441..0d960a0bbb 100644 --- a/data/styles/clear/style-clear/symbols/shop-l.svg +++ b/data/styles/clear/style-clear/symbols/shop-l.svg @@ -1,19 +1,7 @@ - - - - shop-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/shop-m.svg b/data/styles/clear/style-clear/symbols/shop-m.svg index c9dc6335e6..6d7f681105 100644 --- a/data/styles/clear/style-clear/symbols/shop-m.svg +++ b/data/styles/clear/style-clear/symbols/shop-m.svg @@ -1,19 +1,7 @@ - - - - shop-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/shop-s.svg b/data/styles/clear/style-clear/symbols/shop-s.svg index 6c8410d9f7..89303a11e3 100644 --- a/data/styles/clear/style-clear/symbols/shop-s.svg +++ b/data/styles/clear/style-clear/symbols/shop-s.svg @@ -1,19 +1,7 @@ - - - - shop-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/skiing-l.svg b/data/styles/clear/style-clear/symbols/skiing-l.svg index 0692a58bb2..334c5d2220 100644 --- a/data/styles/clear/style-clear/symbols/skiing-l.svg +++ b/data/styles/clear/style-clear/symbols/skiing-l.svg @@ -1,19 +1,7 @@ - - - - skiing-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/skiing-m.svg b/data/styles/clear/style-clear/symbols/skiing-m.svg index 9275e358a1..57ae6e3ce8 100644 --- a/data/styles/clear/style-clear/symbols/skiing-m.svg +++ b/data/styles/clear/style-clear/symbols/skiing-m.svg @@ -1,19 +1,7 @@ - - - - skiing-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/skiing-s.svg b/data/styles/clear/style-clear/symbols/skiing-s.svg index bfdee043d3..92ddef91cf 100644 --- a/data/styles/clear/style-clear/symbols/skiing-s.svg +++ b/data/styles/clear/style-clear/symbols/skiing-s.svg @@ -1,19 +1,7 @@ - - - - skiing-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/soccer-l.svg b/data/styles/clear/style-clear/symbols/soccer-l.svg index ccc827c5de..62419dd95e 100644 --- a/data/styles/clear/style-clear/symbols/soccer-l.svg +++ b/data/styles/clear/style-clear/symbols/soccer-l.svg @@ -1,19 +1,7 @@ - - - - soccer-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/soccer-m.svg b/data/styles/clear/style-clear/symbols/soccer-m.svg index 1a63cba309..8b01adc050 100644 --- a/data/styles/clear/style-clear/symbols/soccer-m.svg +++ b/data/styles/clear/style-clear/symbols/soccer-m.svg @@ -1,19 +1,7 @@ - - - - soccer-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/soccer-s.svg b/data/styles/clear/style-clear/symbols/soccer-s.svg index 3b49be7da9..d327ed7366 100644 --- a/data/styles/clear/style-clear/symbols/soccer-s.svg +++ b/data/styles/clear/style-clear/symbols/soccer-s.svg @@ -1,19 +1,7 @@ - - - - soccer-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/speedcam-l.svg b/data/styles/clear/style-clear/symbols/speedcam-l.svg index f44d9d44c4..5f02c75dae 100644 --- a/data/styles/clear/style-clear/symbols/speedcam-l.svg +++ b/data/styles/clear/style-clear/symbols/speedcam-l.svg @@ -1,16 +1,7 @@ - - - -speedcam-l -Created with Sketch. - - - - - - - + + + + + + diff --git a/data/styles/clear/style-clear/symbols/speedcam-m.svg b/data/styles/clear/style-clear/symbols/speedcam-m.svg index eb397e127c..2f6ced59b2 100644 --- a/data/styles/clear/style-clear/symbols/speedcam-m.svg +++ b/data/styles/clear/style-clear/symbols/speedcam-m.svg @@ -1,14 +1,7 @@ - - - -speedcam-m -Created with Sketch. - - - - - + + + + + + diff --git a/data/styles/clear/style-clear/symbols/speedcam-s.svg b/data/styles/clear/style-clear/symbols/speedcam-s.svg index 4b3bd59178..3d6997b202 100644 --- a/data/styles/clear/style-clear/symbols/speedcam-s.svg +++ b/data/styles/clear/style-clear/symbols/speedcam-s.svg @@ -1,20 +1,7 @@ - - - - speedcam-s - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/speedcam1-l.svg b/data/styles/clear/style-clear/symbols/speedcam1-l.svg deleted file mode 100644 index 50a9ab5fb6..0000000000 --- a/data/styles/clear/style-clear/symbols/speedcam1-l.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - -speedcam-l -Created with Sketch. - - - - - - - - - - - diff --git a/data/styles/clear/style-clear/symbols/speedcam1-m.svg b/data/styles/clear/style-clear/symbols/speedcam1-m.svg deleted file mode 100644 index 345529cbb2..0000000000 --- a/data/styles/clear/style-clear/symbols/speedcam1-m.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - - -speedcam-l -Created with Sketch. - - - - - - - - - diff --git a/data/styles/clear/style-clear/symbols/sports-l.svg b/data/styles/clear/style-clear/symbols/sports-l.svg index 15d4f6d0a0..93d576f5d5 100644 --- a/data/styles/clear/style-clear/symbols/sports-l.svg +++ b/data/styles/clear/style-clear/symbols/sports-l.svg @@ -1,19 +1,7 @@ - - - - sports-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/sports-m.svg b/data/styles/clear/style-clear/symbols/sports-m.svg index 23259b5f6e..340f713fa2 100644 --- a/data/styles/clear/style-clear/symbols/sports-m.svg +++ b/data/styles/clear/style-clear/symbols/sports-m.svg @@ -1,19 +1,7 @@ - - - - sports-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/sports-s.svg b/data/styles/clear/style-clear/symbols/sports-s.svg index 8d3bb7c4eb..9077d2fb63 100644 --- a/data/styles/clear/style-clear/symbols/sports-s.svg +++ b/data/styles/clear/style-clear/symbols/sports-s.svg @@ -1,19 +1,7 @@ - - - - sports-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/stadium-l.svg b/data/styles/clear/style-clear/symbols/stadium-l.svg index 51c0994804..752ecb3940 100644 --- a/data/styles/clear/style-clear/symbols/stadium-l.svg +++ b/data/styles/clear/style-clear/symbols/stadium-l.svg @@ -1,16 +1,7 @@ - - - - stadium-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/stadium-m.svg b/data/styles/clear/style-clear/symbols/stadium-m.svg index a1c8d96f71..5314c1be6e 100644 --- a/data/styles/clear/style-clear/symbols/stadium-m.svg +++ b/data/styles/clear/style-clear/symbols/stadium-m.svg @@ -1,16 +1,7 @@ - - - - stadium-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/stadium-s.svg b/data/styles/clear/style-clear/symbols/stadium-s.svg index a65213d53c..619b532bb5 100644 --- a/data/styles/clear/style-clear/symbols/stadium-s.svg +++ b/data/styles/clear/style-clear/symbols/stadium-s.svg @@ -1,16 +1,7 @@ - - - - stadium-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/star-l.svg b/data/styles/clear/style-clear/symbols/star-l.svg index c9b4ce4926..18395fa583 100644 --- a/data/styles/clear/style-clear/symbols/star-l.svg +++ b/data/styles/clear/style-clear/symbols/star-l.svg @@ -1,25 +1,6 @@ - - - - star-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/star-m.svg b/data/styles/clear/style-clear/symbols/star-m.svg index 2a9b7d0602..d0b7c50825 100644 --- a/data/styles/clear/style-clear/symbols/star-m.svg +++ b/data/styles/clear/style-clear/symbols/star-m.svg @@ -1,19 +1,6 @@ - - - - star-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/star-s.svg b/data/styles/clear/style-clear/symbols/star-s.svg index facf989393..f0b9f04678 100644 --- a/data/styles/clear/style-clear/symbols/star-s.svg +++ b/data/styles/clear/style-clear/symbols/star-s.svg @@ -1,19 +1,6 @@ - - - - star-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-barcelona-l.svg b/data/styles/clear/style-clear/symbols/subway-barcelona-l.svg index 9c3944ec9c..c67c5da036 100644 --- a/data/styles/clear/style-clear/symbols/subway-barcelona-l.svg +++ b/data/styles/clear/style-clear/symbols/subway-barcelona-l.svg @@ -1,14 +1,7 @@ - - - - subway-barcelona-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-barcelona-m.svg b/data/styles/clear/style-clear/symbols/subway-barcelona-m.svg index dd34c0cb77..0f913a0dfd 100644 --- a/data/styles/clear/style-clear/symbols/subway-barcelona-m.svg +++ b/data/styles/clear/style-clear/symbols/subway-barcelona-m.svg @@ -1,14 +1,7 @@ - - - - subway-barcelona-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-barcelona-s.svg b/data/styles/clear/style-clear/symbols/subway-barcelona-s.svg index 4c19aede4a..cf4560246d 100644 --- a/data/styles/clear/style-clear/symbols/subway-barcelona-s.svg +++ b/data/styles/clear/style-clear/symbols/subway-barcelona-s.svg @@ -1,14 +1,7 @@ - - - - subway-barcelona-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-berlin-l.svg b/data/styles/clear/style-clear/symbols/subway-berlin-l.svg index 081093ad44..b8e2977040 100644 --- a/data/styles/clear/style-clear/symbols/subway-berlin-l.svg +++ b/data/styles/clear/style-clear/symbols/subway-berlin-l.svg @@ -1,14 +1,7 @@ - - - - subway-berlin-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-berlin-m.svg b/data/styles/clear/style-clear/symbols/subway-berlin-m.svg index 196e48e09c..0efcf00053 100644 --- a/data/styles/clear/style-clear/symbols/subway-berlin-m.svg +++ b/data/styles/clear/style-clear/symbols/subway-berlin-m.svg @@ -1,14 +1,7 @@ - - - - subway-berlin-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-berlin-s.svg b/data/styles/clear/style-clear/symbols/subway-berlin-s.svg index dd0edb9ecc..3365d46b12 100644 --- a/data/styles/clear/style-clear/symbols/subway-berlin-s.svg +++ b/data/styles/clear/style-clear/symbols/subway-berlin-s.svg @@ -1,14 +1,7 @@ - - - - subway-berlin-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-entrance-2-m.svg b/data/styles/clear/style-clear/symbols/subway-entrance-2-m.svg deleted file mode 100644 index 97515aad80..0000000000 --- a/data/styles/clear/style-clear/symbols/subway-entrance-2-m.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - subway-entrance-2-m - Created with Sketch. - - - - - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/subway-entrance-2-s.svg b/data/styles/clear/style-clear/symbols/subway-entrance-2-s.svg deleted file mode 100644 index 53d1724d5a..0000000000 --- a/data/styles/clear/style-clear/symbols/subway-entrance-2-s.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - subway-entrance-2-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/subway-entrance-arrow.svg b/data/styles/clear/style-clear/symbols/subway-entrance-arrow.svg deleted file mode 100644 index 055ab23647..0000000000 --- a/data/styles/clear/style-clear/symbols/subway-entrance-arrow.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - subway-entrance-arrow - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/subway-entrance-l.svg b/data/styles/clear/style-clear/symbols/subway-entrance-l.svg index 4c4d95d226..d18b5493aa 100644 --- a/data/styles/clear/style-clear/symbols/subway-entrance-l.svg +++ b/data/styles/clear/style-clear/symbols/subway-entrance-l.svg @@ -1,14 +1,7 @@ - - - - subway-entrance-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-entrance-m.svg b/data/styles/clear/style-clear/symbols/subway-entrance-m.svg index aa60e20c41..96f70ebcd6 100644 --- a/data/styles/clear/style-clear/symbols/subway-entrance-m.svg +++ b/data/styles/clear/style-clear/symbols/subway-entrance-m.svg @@ -1,17 +1,7 @@ - - - - subway-entrance-m - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-entrance-s.svg b/data/styles/clear/style-clear/symbols/subway-entrance-s.svg index 7b0be8121a..1a1cbce9cc 100644 --- a/data/styles/clear/style-clear/symbols/subway-entrance-s.svg +++ b/data/styles/clear/style-clear/symbols/subway-entrance-s.svg @@ -1,19 +1,7 @@ - - - - subway-entrance-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-kiev-l.svg b/data/styles/clear/style-clear/symbols/subway-kiev-l.svg index 95b1d359a8..50e56a54e0 100644 --- a/data/styles/clear/style-clear/symbols/subway-kiev-l.svg +++ b/data/styles/clear/style-clear/symbols/subway-kiev-l.svg @@ -1,13 +1,6 @@ - - - - subway-kiev-l - Created with Sketch. - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-kiev-m.svg b/data/styles/clear/style-clear/symbols/subway-kiev-m.svg index 7ef73b8830..50e56a54e0 100644 --- a/data/styles/clear/style-clear/symbols/subway-kiev-m.svg +++ b/data/styles/clear/style-clear/symbols/subway-kiev-m.svg @@ -1,13 +1,6 @@ - - - - subway-kiev-m - Created with Sketch. - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-kiev-s.svg b/data/styles/clear/style-clear/symbols/subway-kiev-s.svg index 18c67020f7..b717c8f053 100644 --- a/data/styles/clear/style-clear/symbols/subway-kiev-s.svg +++ b/data/styles/clear/style-clear/symbols/subway-kiev-s.svg @@ -1,13 +1,6 @@ - - - - subway-kiev-s - Created with Sketch. - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-l.svg b/data/styles/clear/style-clear/symbols/subway-l.svg index da4a1c150b..183d2f9764 100644 --- a/data/styles/clear/style-clear/symbols/subway-l.svg +++ b/data/styles/clear/style-clear/symbols/subway-l.svg @@ -1,25 +1,7 @@ - - - - subway-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-london-l.svg b/data/styles/clear/style-clear/symbols/subway-london-l.svg index e0e2560d82..f2448d9cba 100644 --- a/data/styles/clear/style-clear/symbols/subway-london-l.svg +++ b/data/styles/clear/style-clear/symbols/subway-london-l.svg @@ -1,15 +1,8 @@ - - - - subway-london-l - Created with Sketch. - - - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-london-m.svg b/data/styles/clear/style-clear/symbols/subway-london-m.svg index 339407ec08..24e819ef78 100644 --- a/data/styles/clear/style-clear/symbols/subway-london-m.svg +++ b/data/styles/clear/style-clear/symbols/subway-london-m.svg @@ -1,14 +1,7 @@ - - - - subway-london-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-london-s.svg b/data/styles/clear/style-clear/symbols/subway-london-s.svg index 1311d1733b..dd2c4c9bf0 100644 --- a/data/styles/clear/style-clear/symbols/subway-london-s.svg +++ b/data/styles/clear/style-clear/symbols/subway-london-s.svg @@ -1,15 +1,8 @@ - - - - subway-london-s - Created with Sketch. - - - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-m.svg b/data/styles/clear/style-clear/symbols/subway-m.svg index 0ebcdf544d..0965b38239 100644 --- a/data/styles/clear/style-clear/symbols/subway-m.svg +++ b/data/styles/clear/style-clear/symbols/subway-m.svg @@ -1,23 +1,7 @@ - - - - subway-m - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-madrid-l.svg b/data/styles/clear/style-clear/symbols/subway-madrid-l.svg index b9ca82f3e6..3c7255ff1e 100644 --- a/data/styles/clear/style-clear/symbols/subway-madrid-l.svg +++ b/data/styles/clear/style-clear/symbols/subway-madrid-l.svg @@ -1,14 +1,7 @@ - - - - subway-madrid-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-madrid-m.svg b/data/styles/clear/style-clear/symbols/subway-madrid-m.svg index af85a54f74..6053559ec2 100644 --- a/data/styles/clear/style-clear/symbols/subway-madrid-m.svg +++ b/data/styles/clear/style-clear/symbols/subway-madrid-m.svg @@ -1,14 +1,7 @@ - - - - subway-madrid-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-madrid-s.svg b/data/styles/clear/style-clear/symbols/subway-madrid-s.svg index 9cb90934f9..bf2245cbda 100644 --- a/data/styles/clear/style-clear/symbols/subway-madrid-s.svg +++ b/data/styles/clear/style-clear/symbols/subway-madrid-s.svg @@ -1,14 +1,7 @@ - - - - subway-madrid-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-minsk-l.svg b/data/styles/clear/style-clear/symbols/subway-minsk-l.svg index 99db3cb555..dfc9a19862 100644 --- a/data/styles/clear/style-clear/symbols/subway-minsk-l.svg +++ b/data/styles/clear/style-clear/symbols/subway-minsk-l.svg @@ -1,13 +1,6 @@ - - - - subway-minsk-l - Created with Sketch. - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-minsk-m.svg b/data/styles/clear/style-clear/symbols/subway-minsk-m.svg index 59d298ff1f..b7548aa9ec 100644 --- a/data/styles/clear/style-clear/symbols/subway-minsk-m.svg +++ b/data/styles/clear/style-clear/symbols/subway-minsk-m.svg @@ -1,13 +1,6 @@ - - - - subway-minsk-m - Created with Sketch. - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-minsk-s.svg b/data/styles/clear/style-clear/symbols/subway-minsk-s.svg index ff3757d812..0ff06a5b5a 100644 --- a/data/styles/clear/style-clear/symbols/subway-minsk-s.svg +++ b/data/styles/clear/style-clear/symbols/subway-minsk-s.svg @@ -1,13 +1,6 @@ - - - - subway-minsk-s - Created with Sketch. - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-moscow-l.svg b/data/styles/clear/style-clear/symbols/subway-moscow-l.svg index 07c05f8446..84966c052b 100644 --- a/data/styles/clear/style-clear/symbols/subway-moscow-l.svg +++ b/data/styles/clear/style-clear/symbols/subway-moscow-l.svg @@ -1,13 +1,6 @@ - - - - subway-moscow-l - Created with Sketch. - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-moscow-m.svg b/data/styles/clear/style-clear/symbols/subway-moscow-m.svg index 648039224b..e5952c4147 100644 --- a/data/styles/clear/style-clear/symbols/subway-moscow-m.svg +++ b/data/styles/clear/style-clear/symbols/subway-moscow-m.svg @@ -1,13 +1,6 @@ - - - - subway-moscow-m - Created with Sketch. - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-moscow-s.svg b/data/styles/clear/style-clear/symbols/subway-moscow-s.svg index 5cbc34d03c..349172d31d 100644 --- a/data/styles/clear/style-clear/symbols/subway-moscow-s.svg +++ b/data/styles/clear/style-clear/symbols/subway-moscow-s.svg @@ -1,13 +1,6 @@ - - - - subway-moscow-s - Created with Sketch. - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-newyork-l.svg b/data/styles/clear/style-clear/symbols/subway-newyork-l.svg index af2dc1dd9d..094fa9a708 100644 --- a/data/styles/clear/style-clear/symbols/subway-newyork-l.svg +++ b/data/styles/clear/style-clear/symbols/subway-newyork-l.svg @@ -1,16 +1,7 @@ - - - - subway-newyork-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-newyork-m.svg b/data/styles/clear/style-clear/symbols/subway-newyork-m.svg index dc16b2bda5..3c54216bbc 100644 --- a/data/styles/clear/style-clear/symbols/subway-newyork-m.svg +++ b/data/styles/clear/style-clear/symbols/subway-newyork-m.svg @@ -1,14 +1,7 @@ - - - - subway-newyork-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-newyork-s.svg b/data/styles/clear/style-clear/symbols/subway-newyork-s.svg index ef3636a42a..8ebf5dd951 100644 --- a/data/styles/clear/style-clear/symbols/subway-newyork-s.svg +++ b/data/styles/clear/style-clear/symbols/subway-newyork-s.svg @@ -1,17 +1,7 @@ - - - - subway-newyork-s - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-newyork-xs.svg b/data/styles/clear/style-clear/symbols/subway-newyork-xs.svg index 8cd48ea8d0..567d13ceaf 100644 --- a/data/styles/clear/style-clear/symbols/subway-newyork-xs.svg +++ b/data/styles/clear/style-clear/symbols/subway-newyork-xs.svg @@ -1,14 +1,7 @@ - - - - subway-newyork-xs - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-paris-l.svg b/data/styles/clear/style-clear/symbols/subway-paris-l.svg index 5328ab5a25..813bf2462e 100644 --- a/data/styles/clear/style-clear/symbols/subway-paris-l.svg +++ b/data/styles/clear/style-clear/symbols/subway-paris-l.svg @@ -1,14 +1,7 @@ - - - - subway-paris-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-paris-m.svg b/data/styles/clear/style-clear/symbols/subway-paris-m.svg index 708171cebf..6fb6f45cbb 100644 --- a/data/styles/clear/style-clear/symbols/subway-paris-m.svg +++ b/data/styles/clear/style-clear/symbols/subway-paris-m.svg @@ -1,14 +1,7 @@ - - - - subway-paris-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-paris-s.svg b/data/styles/clear/style-clear/symbols/subway-paris-s.svg index 0ff2907f2f..5cbc7a4f1e 100644 --- a/data/styles/clear/style-clear/symbols/subway-paris-s.svg +++ b/data/styles/clear/style-clear/symbols/subway-paris-s.svg @@ -1,14 +1,7 @@ - - - - subway-paris-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-rome-l.svg b/data/styles/clear/style-clear/symbols/subway-rome-l.svg index 722eae003a..62f784bd2b 100644 --- a/data/styles/clear/style-clear/symbols/subway-rome-l.svg +++ b/data/styles/clear/style-clear/symbols/subway-rome-l.svg @@ -1,14 +1,7 @@ - - - - subway-rome-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-rome-m.svg b/data/styles/clear/style-clear/symbols/subway-rome-m.svg index 9748572a20..8841127544 100644 --- a/data/styles/clear/style-clear/symbols/subway-rome-m.svg +++ b/data/styles/clear/style-clear/symbols/subway-rome-m.svg @@ -1,14 +1,7 @@ - - - - subway-rome-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-rome-s.svg b/data/styles/clear/style-clear/symbols/subway-rome-s.svg index a807db7133..d8173ff49a 100644 --- a/data/styles/clear/style-clear/symbols/subway-rome-s.svg +++ b/data/styles/clear/style-clear/symbols/subway-rome-s.svg @@ -1,14 +1,7 @@ - - - - subway-rome-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-s.svg b/data/styles/clear/style-clear/symbols/subway-s.svg index b328196bfe..1f47ae66d5 100644 --- a/data/styles/clear/style-clear/symbols/subway-s.svg +++ b/data/styles/clear/style-clear/symbols/subway-s.svg @@ -1,25 +1,7 @@ - - - - subway-s - Created with Sketch. - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-spb-l.svg b/data/styles/clear/style-clear/symbols/subway-spb-l.svg index f8803ef993..f6bece9364 100644 --- a/data/styles/clear/style-clear/symbols/subway-spb-l.svg +++ b/data/styles/clear/style-clear/symbols/subway-spb-l.svg @@ -1,14 +1,7 @@ - - - - subway-spb-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-spb-m.svg b/data/styles/clear/style-clear/symbols/subway-spb-m.svg index c2ceae0d93..d043f98a95 100644 --- a/data/styles/clear/style-clear/symbols/subway-spb-m.svg +++ b/data/styles/clear/style-clear/symbols/subway-spb-m.svg @@ -1,14 +1,7 @@ - - - - subway-spb-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-spb-s.svg b/data/styles/clear/style-clear/symbols/subway-spb-s.svg index fc45230c4e..090806f0c5 100644 --- a/data/styles/clear/style-clear/symbols/subway-spb-s.svg +++ b/data/styles/clear/style-clear/symbols/subway-spb-s.svg @@ -1,14 +1,7 @@ - - - - subway-spb-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/subway-xs.svg b/data/styles/clear/style-clear/symbols/subway-xs.svg index 898e1a425d..b524c17b1e 100644 --- a/data/styles/clear/style-clear/symbols/subway-xs.svg +++ b/data/styles/clear/style-clear/symbols/subway-xs.svg @@ -1,19 +1,7 @@ - - - - subway-xs - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/survey_point-l.svg b/data/styles/clear/style-clear/symbols/survey_point-l.svg index 9d2b56d484..1a9519981c 100644 --- a/data/styles/clear/style-clear/symbols/survey_point-l.svg +++ b/data/styles/clear/style-clear/symbols/survey_point-l.svg @@ -1,15 +1,9 @@ - - - - survey_point-l - Created with Sketch. - - - - - - - - - - \ No newline at end of file + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/survey_point-m.svg b/data/styles/clear/style-clear/symbols/survey_point-m.svg index b011990435..3d304f7396 100644 --- a/data/styles/clear/style-clear/symbols/survey_point-m.svg +++ b/data/styles/clear/style-clear/symbols/survey_point-m.svg @@ -1,15 +1,9 @@ - - - - survey_point-m - Created with Sketch. - - - - - - - - - - \ No newline at end of file + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/survey_point-s.svg b/data/styles/clear/style-clear/symbols/survey_point-s.svg index e7a3a06ba5..766dafc16d 100644 --- a/data/styles/clear/style-clear/symbols/survey_point-s.svg +++ b/data/styles/clear/style-clear/symbols/survey_point-s.svg @@ -1,15 +1,9 @@ - - - - survey_point-s - Created with Sketch. - - - - - - - - - - \ No newline at end of file + + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/sweets-l.svg b/data/styles/clear/style-clear/symbols/sweets-l.svg index f43989599b..110997e51a 100644 --- a/data/styles/clear/style-clear/symbols/sweets-l.svg +++ b/data/styles/clear/style-clear/symbols/sweets-l.svg @@ -1,19 +1,7 @@ - - - - sweets-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/sweets-m.svg b/data/styles/clear/style-clear/symbols/sweets-m.svg index e645045ccc..54097e57cd 100644 --- a/data/styles/clear/style-clear/symbols/sweets-m.svg +++ b/data/styles/clear/style-clear/symbols/sweets-m.svg @@ -1,19 +1,7 @@ - - - - sweets-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/sweets-s.svg b/data/styles/clear/style-clear/symbols/sweets-s.svg index bee1bf606e..83579604c4 100644 --- a/data/styles/clear/style-clear/symbols/sweets-s.svg +++ b/data/styles/clear/style-clear/symbols/sweets-s.svg @@ -1,21 +1,7 @@ - - - - sweets-s - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/swimming-l.svg b/data/styles/clear/style-clear/symbols/swimming-l.svg index e3e7264c46..6f946935af 100644 --- a/data/styles/clear/style-clear/symbols/swimming-l.svg +++ b/data/styles/clear/style-clear/symbols/swimming-l.svg @@ -1,19 +1,7 @@ - - - - swimming-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/swimming-m.svg b/data/styles/clear/style-clear/symbols/swimming-m.svg index d8d475ff7e..e50bdfe924 100644 --- a/data/styles/clear/style-clear/symbols/swimming-m.svg +++ b/data/styles/clear/style-clear/symbols/swimming-m.svg @@ -1,19 +1,7 @@ - - - - swimming-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/swimming-s.svg b/data/styles/clear/style-clear/symbols/swimming-s.svg index 4106cb0ee1..9a109d7280 100644 --- a/data/styles/clear/style-clear/symbols/swimming-s.svg +++ b/data/styles/clear/style-clear/symbols/swimming-s.svg @@ -1,19 +1,7 @@ - - - - swimming-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/taoist-l.svg b/data/styles/clear/style-clear/symbols/taoist-l.svg index 246c7ca9b5..4890e589ff 100644 --- a/data/styles/clear/style-clear/symbols/taoist-l.svg +++ b/data/styles/clear/style-clear/symbols/taoist-l.svg @@ -1,23 +1,7 @@ - - - - taoist-l - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/taoist-m.svg b/data/styles/clear/style-clear/symbols/taoist-m.svg index 14e762dc1e..70ecf40531 100644 --- a/data/styles/clear/style-clear/symbols/taoist-m.svg +++ b/data/styles/clear/style-clear/symbols/taoist-m.svg @@ -1,17 +1,7 @@ - - - - taoist-m - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/taoist-s.svg b/data/styles/clear/style-clear/symbols/taoist-s.svg index 079f422e1e..d630205918 100644 --- a/data/styles/clear/style-clear/symbols/taoist-s.svg +++ b/data/styles/clear/style-clear/symbols/taoist-s.svg @@ -1,17 +1,7 @@ - - - - taoist-s - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/taxi-l.svg b/data/styles/clear/style-clear/symbols/taxi-l.svg index e48e6eaacd..0420555a60 100644 --- a/data/styles/clear/style-clear/symbols/taxi-l.svg +++ b/data/styles/clear/style-clear/symbols/taxi-l.svg @@ -1,19 +1,7 @@ - - - - taxi-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/taxi-m.svg b/data/styles/clear/style-clear/symbols/taxi-m.svg index 8e83a8f71c..8705b9f293 100644 --- a/data/styles/clear/style-clear/symbols/taxi-m.svg +++ b/data/styles/clear/style-clear/symbols/taxi-m.svg @@ -1,19 +1,7 @@ - - - - taxi-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/taxi-s.svg b/data/styles/clear/style-clear/symbols/taxi-s.svg index 1578590db8..e64ccf26ba 100644 --- a/data/styles/clear/style-clear/symbols/taxi-s.svg +++ b/data/styles/clear/style-clear/symbols/taxi-s.svg @@ -1,19 +1,7 @@ - - - - taxi-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/tennis-l.svg b/data/styles/clear/style-clear/symbols/tennis-l.svg index 5af3414016..622c1f3a33 100644 --- a/data/styles/clear/style-clear/symbols/tennis-l.svg +++ b/data/styles/clear/style-clear/symbols/tennis-l.svg @@ -1,19 +1,7 @@ - - - - tennis-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/tennis-m.svg b/data/styles/clear/style-clear/symbols/tennis-m.svg index f00b5e29e4..8dbd4c71a2 100644 --- a/data/styles/clear/style-clear/symbols/tennis-m.svg +++ b/data/styles/clear/style-clear/symbols/tennis-m.svg @@ -1,19 +1,7 @@ - - - - tennis-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/tennis-s.svg b/data/styles/clear/style-clear/symbols/tennis-s.svg index 1ef61148e4..5f5ba04369 100644 --- a/data/styles/clear/style-clear/symbols/tennis-s.svg +++ b/data/styles/clear/style-clear/symbols/tennis-s.svg @@ -1,19 +1,7 @@ - - - - tennis-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/theatre-l.svg b/data/styles/clear/style-clear/symbols/theatre-l.svg index 87203867b8..92e24036fd 100644 --- a/data/styles/clear/style-clear/symbols/theatre-l.svg +++ b/data/styles/clear/style-clear/symbols/theatre-l.svg @@ -1,14 +1,7 @@ - - - - theatre-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/theatre-m.svg b/data/styles/clear/style-clear/symbols/theatre-m.svg index 9b7cb3b59e..96747a1631 100644 --- a/data/styles/clear/style-clear/symbols/theatre-m.svg +++ b/data/styles/clear/style-clear/symbols/theatre-m.svg @@ -1,14 +1,7 @@ - - - - theatre-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/theatre-s.svg b/data/styles/clear/style-clear/symbols/theatre-s.svg index ce0f0abdba..293a95e409 100644 --- a/data/styles/clear/style-clear/symbols/theatre-s.svg +++ b/data/styles/clear/style-clear/symbols/theatre-s.svg @@ -1,16 +1,7 @@ - - - - theatre-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/ticket-shop-l.svg b/data/styles/clear/style-clear/symbols/ticket-shop-l.svg index 58ef55581e..8c2bac39e4 100644 --- a/data/styles/clear/style-clear/symbols/ticket-shop-l.svg +++ b/data/styles/clear/style-clear/symbols/ticket-shop-l.svg @@ -1,25 +1,7 @@ - - - - ticket-shop-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/ticket-shop-m.svg b/data/styles/clear/style-clear/symbols/ticket-shop-m.svg index 6852a16f1d..7294add6fd 100644 --- a/data/styles/clear/style-clear/symbols/ticket-shop-m.svg +++ b/data/styles/clear/style-clear/symbols/ticket-shop-m.svg @@ -1,25 +1,7 @@ - - - - ticket-shop-m - Created with Sketch. - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/ticket-shop-s.svg b/data/styles/clear/style-clear/symbols/ticket-shop-s.svg new file mode 100644 index 0000000000..eb61feed92 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/ticket-shop-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/tire-repair-l.svg b/data/styles/clear/style-clear/symbols/tire-repair-l.svg index 5beb6a26f2..0286de1087 100644 --- a/data/styles/clear/style-clear/symbols/tire-repair-l.svg +++ b/data/styles/clear/style-clear/symbols/tire-repair-l.svg @@ -1,21 +1,7 @@ - - - - tire-repair-l - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/tire-repair-m.svg b/data/styles/clear/style-clear/symbols/tire-repair-m.svg index 08dda70d97..519f142d9a 100644 --- a/data/styles/clear/style-clear/symbols/tire-repair-m.svg +++ b/data/styles/clear/style-clear/symbols/tire-repair-m.svg @@ -1,21 +1,7 @@ - - - - tire-repair-m - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/tire-repair-s.svg b/data/styles/clear/style-clear/symbols/tire-repair-s.svg new file mode 100644 index 0000000000..3e4e9f09e0 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/tire-repair-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/toilets-l.svg b/data/styles/clear/style-clear/symbols/toilets-l.svg index cab1773311..a2f39bb7b3 100644 --- a/data/styles/clear/style-clear/symbols/toilets-l.svg +++ b/data/styles/clear/style-clear/symbols/toilets-l.svg @@ -1,16 +1,7 @@ - - - - toilets-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/toilets-m.svg b/data/styles/clear/style-clear/symbols/toilets-m.svg index 79ccfa0fac..6e7e3fb23c 100644 --- a/data/styles/clear/style-clear/symbols/toilets-m.svg +++ b/data/styles/clear/style-clear/symbols/toilets-m.svg @@ -1,16 +1,7 @@ - - - - toilets-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/toilets-s.svg b/data/styles/clear/style-clear/symbols/toilets-s.svg index a283c1abb4..b78a816224 100644 --- a/data/styles/clear/style-clear/symbols/toilets-s.svg +++ b/data/styles/clear/style-clear/symbols/toilets-s.svg @@ -1,16 +1,7 @@ - - - - toilets-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/toll_booth-l.svg b/data/styles/clear/style-clear/symbols/toll_booth-l.svg index 89ebc44145..d8f826dd51 100644 --- a/data/styles/clear/style-clear/symbols/toll_booth-l.svg +++ b/data/styles/clear/style-clear/symbols/toll_booth-l.svg @@ -1,22 +1,7 @@ - - - - toll_booth-l - Created with Sketch. - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/toll_booth-m.svg b/data/styles/clear/style-clear/symbols/toll_booth-m.svg index 68c470087a..3d66492b87 100644 --- a/data/styles/clear/style-clear/symbols/toll_booth-m.svg +++ b/data/styles/clear/style-clear/symbols/toll_booth-m.svg @@ -1,28 +1,7 @@ - - - - toll_booth-m - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/toll_booth-s.svg b/data/styles/clear/style-clear/symbols/toll_booth-s.svg index b05e0900d3..167ed7a5f9 100644 --- a/data/styles/clear/style-clear/symbols/toll_booth-s.svg +++ b/data/styles/clear/style-clear/symbols/toll_booth-s.svg @@ -1,22 +1,7 @@ - - - - toll_booth-s - Created with Sketch. - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/tomb-l.svg b/data/styles/clear/style-clear/symbols/tomb-l.svg index 06afe9eeda..c1d47b0d02 100644 --- a/data/styles/clear/style-clear/symbols/tomb-l.svg +++ b/data/styles/clear/style-clear/symbols/tomb-l.svg @@ -1,21 +1,7 @@ - - - - tomb-l - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/tomb-m.svg b/data/styles/clear/style-clear/symbols/tomb-m.svg index 4ab847084f..b43857097c 100644 --- a/data/styles/clear/style-clear/symbols/tomb-m.svg +++ b/data/styles/clear/style-clear/symbols/tomb-m.svg @@ -1,21 +1,7 @@ - - - - tomb-m - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/tomb-s.svg b/data/styles/clear/style-clear/symbols/tomb-s.svg index 0e852aae9a..ba93e3c55f 100644 --- a/data/styles/clear/style-clear/symbols/tomb-s.svg +++ b/data/styles/clear/style-clear/symbols/tomb-s.svg @@ -1,21 +1,7 @@ - - - - tomb-s - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/tourism-l.svg b/data/styles/clear/style-clear/symbols/tourism-l.svg index 50671ac451..45c1125ab7 100644 --- a/data/styles/clear/style-clear/symbols/tourism-l.svg +++ b/data/styles/clear/style-clear/symbols/tourism-l.svg @@ -1,14 +1,7 @@ - - - - tourism-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/tourism-m.svg b/data/styles/clear/style-clear/symbols/tourism-m.svg index 21e8c450d4..dc718ff4d2 100644 --- a/data/styles/clear/style-clear/symbols/tourism-m.svg +++ b/data/styles/clear/style-clear/symbols/tourism-m.svg @@ -1,14 +1,7 @@ - - - - tourism-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/tourism-s.svg b/data/styles/clear/style-clear/symbols/tourism-s.svg index d05592e484..da4e8b16a5 100644 --- a/data/styles/clear/style-clear/symbols/tourism-s.svg +++ b/data/styles/clear/style-clear/symbols/tourism-s.svg @@ -1,14 +1,7 @@ - - - - tourism-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/toys-l.svg b/data/styles/clear/style-clear/symbols/toys-l.svg index f122cd447b..6abb185803 100644 --- a/data/styles/clear/style-clear/symbols/toys-l.svg +++ b/data/styles/clear/style-clear/symbols/toys-l.svg @@ -1,19 +1,7 @@ - - - - toys-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/toys-m.svg b/data/styles/clear/style-clear/symbols/toys-m.svg index 8721b3f9ab..9c326d2837 100644 --- a/data/styles/clear/style-clear/symbols/toys-m.svg +++ b/data/styles/clear/style-clear/symbols/toys-m.svg @@ -1,19 +1,7 @@ - - - - toys-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/toys-s.svg b/data/styles/clear/style-clear/symbols/toys-s.svg new file mode 100644 index 0000000000..55128c4dd6 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/toys-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/train-l.svg b/data/styles/clear/style-clear/symbols/train-l.svg index 0a5b1e6895..8a4dea379a 100644 --- a/data/styles/clear/style-clear/symbols/train-l.svg +++ b/data/styles/clear/style-clear/symbols/train-l.svg @@ -1,26 +1,7 @@ - - - - train-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/train-m.svg b/data/styles/clear/style-clear/symbols/train-m.svg index 85966c2239..39a1c013a7 100644 --- a/data/styles/clear/style-clear/symbols/train-m.svg +++ b/data/styles/clear/style-clear/symbols/train-m.svg @@ -1,24 +1,7 @@ - - - - train-m - Created with Sketch. - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/train-s.svg b/data/styles/clear/style-clear/symbols/train-s.svg index ef00f15cf1..6a10ab2921 100644 --- a/data/styles/clear/style-clear/symbols/train-s.svg +++ b/data/styles/clear/style-clear/symbols/train-s.svg @@ -1,24 +1,7 @@ - - - - train-s - Created with Sketch. - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/train-xs.svg b/data/styles/clear/style-clear/symbols/train-xs.svg new file mode 100644 index 0000000000..b524c17b1e --- /dev/null +++ b/data/styles/clear/style-clear/symbols/train-xs.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/tram-l.svg b/data/styles/clear/style-clear/symbols/tram-l.svg index 4933839ebd..b0bb6b642c 100644 --- a/data/styles/clear/style-clear/symbols/tram-l.svg +++ b/data/styles/clear/style-clear/symbols/tram-l.svg @@ -1,25 +1,7 @@ - - - - tram-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/tram-m.svg b/data/styles/clear/style-clear/symbols/tram-m.svg index dad5c98621..6a4154e712 100644 --- a/data/styles/clear/style-clear/symbols/tram-m.svg +++ b/data/styles/clear/style-clear/symbols/tram-m.svg @@ -1,23 +1,7 @@ - - - - tram-m - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/tram-s.svg b/data/styles/clear/style-clear/symbols/tram-s.svg index b55e38fc44..ee25a182dc 100644 --- a/data/styles/clear/style-clear/symbols/tram-s.svg +++ b/data/styles/clear/style-clear/symbols/tram-s.svg @@ -1,25 +1,7 @@ - - - - tram-s - Created with Sketch. - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/travel_agency_shop-l.svg b/data/styles/clear/style-clear/symbols/travel_agency_shop-l.svg index f9592ea9ba..c4b5886eee 100644 --- a/data/styles/clear/style-clear/symbols/travel_agency_shop-l.svg +++ b/data/styles/clear/style-clear/symbols/travel_agency_shop-l.svg @@ -1,29 +1,7 @@ - - - - travel_agency_shop-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/travel_agency_shop-m.svg b/data/styles/clear/style-clear/symbols/travel_agency_shop-m.svg index f4d88b148f..92158db8c1 100644 --- a/data/styles/clear/style-clear/symbols/travel_agency_shop-m.svg +++ b/data/styles/clear/style-clear/symbols/travel_agency_shop-m.svg @@ -1,23 +1,7 @@ - - - - travel_agency_shop-m - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/travel_agency_shop-s.svg b/data/styles/clear/style-clear/symbols/travel_agency_shop-s.svg new file mode 100644 index 0000000000..9db8ff5117 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/travel_agency_shop-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/tree-l.svg b/data/styles/clear/style-clear/symbols/tree-l.svg deleted file mode 100644 index b6e7fb20c5..0000000000 --- a/data/styles/clear/style-clear/symbols/tree-l.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - tree-l - Created with Sketch. - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/tree-m.svg b/data/styles/clear/style-clear/symbols/tree-m.svg deleted file mode 100644 index 03fa63793c..0000000000 --- a/data/styles/clear/style-clear/symbols/tree-m.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - tree-m - Created with Sketch. - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/tree-s.svg b/data/styles/clear/style-clear/symbols/tree-s.svg deleted file mode 100644 index 9f3888d8b6..0000000000 --- a/data/styles/clear/style-clear/symbols/tree-s.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - tree-s - Created with Sketch. - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-clear/symbols/vending-l.svg b/data/styles/clear/style-clear/symbols/vending-l.svg index 7b27e36f6a..7afc4484ae 100644 --- a/data/styles/clear/style-clear/symbols/vending-l.svg +++ b/data/styles/clear/style-clear/symbols/vending-l.svg @@ -1,12 +1,6 @@ - - - - vending-l - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/vending-m.svg b/data/styles/clear/style-clear/symbols/vending-m.svg index a2ad527f1a..416fd5441f 100644 --- a/data/styles/clear/style-clear/symbols/vending-m.svg +++ b/data/styles/clear/style-clear/symbols/vending-m.svg @@ -1,12 +1,6 @@ - - - - vending-m - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/vending-s.svg b/data/styles/clear/style-clear/symbols/vending-s.svg index beba92238b..33157b8e68 100644 --- a/data/styles/clear/style-clear/symbols/vending-s.svg +++ b/data/styles/clear/style-clear/symbols/vending-s.svg @@ -1,12 +1,6 @@ - - - - vending-s - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/veterinary-l.svg b/data/styles/clear/style-clear/symbols/veterinary-l.svg index 5976d53eb3..7ebad6b81c 100644 --- a/data/styles/clear/style-clear/symbols/veterinary-l.svg +++ b/data/styles/clear/style-clear/symbols/veterinary-l.svg @@ -1,22 +1,7 @@ - - - - veterinary-l - Created with Sketch. - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/veterinary-m.svg b/data/styles/clear/style-clear/symbols/veterinary-m.svg index c569273561..358cbee81c 100644 --- a/data/styles/clear/style-clear/symbols/veterinary-m.svg +++ b/data/styles/clear/style-clear/symbols/veterinary-m.svg @@ -1,16 +1,7 @@ - - - - veterinary-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/veterinary-s.svg b/data/styles/clear/style-clear/symbols/veterinary-s.svg index 65a2ae766e..7bbd69545b 100644 --- a/data/styles/clear/style-clear/symbols/veterinary-s.svg +++ b/data/styles/clear/style-clear/symbols/veterinary-s.svg @@ -1,16 +1,7 @@ - - - - veterinary-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/viewpoint-l.svg b/data/styles/clear/style-clear/symbols/viewpoint-l.svg index caa00925d8..d1e68780b3 100644 --- a/data/styles/clear/style-clear/symbols/viewpoint-l.svg +++ b/data/styles/clear/style-clear/symbols/viewpoint-l.svg @@ -1,18 +1,7 @@ - - - - viewpoint-l - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/viewpoint-m.svg b/data/styles/clear/style-clear/symbols/viewpoint-m.svg index 9097c8e5a8..084cf80e6b 100644 --- a/data/styles/clear/style-clear/symbols/viewpoint-m.svg +++ b/data/styles/clear/style-clear/symbols/viewpoint-m.svg @@ -1,18 +1,7 @@ - - - - viewpoint-m - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/viewpoint-s.svg b/data/styles/clear/style-clear/symbols/viewpoint-s.svg index 321fd86e96..51185191c5 100644 --- a/data/styles/clear/style-clear/symbols/viewpoint-s.svg +++ b/data/styles/clear/style-clear/symbols/viewpoint-s.svg @@ -1,14 +1,7 @@ - - - - viewpoint-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/volcano-l.svg b/data/styles/clear/style-clear/symbols/volcano-l.svg index ab118642e6..4dd79f7b3b 100644 --- a/data/styles/clear/style-clear/symbols/volcano-l.svg +++ b/data/styles/clear/style-clear/symbols/volcano-l.svg @@ -1,12 +1,3 @@ - - - - volcano-l - Created with Sketch. - - - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-clear/symbols/volcano-m.svg b/data/styles/clear/style-clear/symbols/volcano-m.svg index 135ef21dba..2070c94568 100644 --- a/data/styles/clear/style-clear/symbols/volcano-m.svg +++ b/data/styles/clear/style-clear/symbols/volcano-m.svg @@ -1,12 +1,3 @@ - - - - volcano-m - Created with Sketch. - - - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-clear/symbols/volcano-s.svg b/data/styles/clear/style-clear/symbols/volcano-s.svg index 78d1366b4d..d92baa38b3 100644 --- a/data/styles/clear/style-clear/symbols/volcano-s.svg +++ b/data/styles/clear/style-clear/symbols/volcano-s.svg @@ -1,12 +1,3 @@ - - - - volcano-s - Created with Sketch. - - - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-clear/symbols/waste-basket-l.svg b/data/styles/clear/style-clear/symbols/waste-basket-l.svg index 3a81dbf4eb..f93e55943e 100644 --- a/data/styles/clear/style-clear/symbols/waste-basket-l.svg +++ b/data/styles/clear/style-clear/symbols/waste-basket-l.svg @@ -1,13 +1,6 @@ - - - - waste-basket-l - Created with Sketch. - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/waste-basket-m.svg b/data/styles/clear/style-clear/symbols/waste-basket-m.svg index bbd99f7b59..6724607b78 100644 --- a/data/styles/clear/style-clear/symbols/waste-basket-m.svg +++ b/data/styles/clear/style-clear/symbols/waste-basket-m.svg @@ -1,13 +1,6 @@ - - - - waste-basket-m - Created with Sketch. - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/waste-basket-s.svg b/data/styles/clear/style-clear/symbols/waste-basket-s.svg index 0562644d72..0399f712d2 100644 --- a/data/styles/clear/style-clear/symbols/waste-basket-s.svg +++ b/data/styles/clear/style-clear/symbols/waste-basket-s.svg @@ -1,13 +1,6 @@ - - - - waste-basket-s - Created with Sketch. - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-clear/symbols/waterfall-l.svg b/data/styles/clear/style-clear/symbols/waterfall-l.svg index a9dbe6f785..78a8588460 100644 --- a/data/styles/clear/style-clear/symbols/waterfall-l.svg +++ b/data/styles/clear/style-clear/symbols/waterfall-l.svg @@ -1,16 +1,7 @@ - - - - waterfall-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/waterfall-m.svg b/data/styles/clear/style-clear/symbols/waterfall-m.svg index 71334d1fb5..da1d699947 100644 --- a/data/styles/clear/style-clear/symbols/waterfall-m.svg +++ b/data/styles/clear/style-clear/symbols/waterfall-m.svg @@ -1,16 +1,7 @@ - - - - waterfall-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/waterfall-s.svg b/data/styles/clear/style-clear/symbols/waterfall-s.svg index cc93d89351..a894bf9333 100644 --- a/data/styles/clear/style-clear/symbols/waterfall-s.svg +++ b/data/styles/clear/style-clear/symbols/waterfall-s.svg @@ -1,16 +1,7 @@ - - - - waterfall-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/wayside_shrine-l.svg b/data/styles/clear/style-clear/symbols/wayside_shrine-l.svg index c6300d09dd..7ae7ca45e8 100644 --- a/data/styles/clear/style-clear/symbols/wayside_shrine-l.svg +++ b/data/styles/clear/style-clear/symbols/wayside_shrine-l.svg @@ -1,21 +1,7 @@ - - - - wayside_shrine-l - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/wayside_shrine-m.svg b/data/styles/clear/style-clear/symbols/wayside_shrine-m.svg index 1e1c3a353e..9872e13327 100644 --- a/data/styles/clear/style-clear/symbols/wayside_shrine-m.svg +++ b/data/styles/clear/style-clear/symbols/wayside_shrine-m.svg @@ -1,21 +1,7 @@ - - - - wayside_shrine-m - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/wayside_shrine-s.svg b/data/styles/clear/style-clear/symbols/wayside_shrine-s.svg index 73fd83c23b..eb9ccb6704 100644 --- a/data/styles/clear/style-clear/symbols/wayside_shrine-s.svg +++ b/data/styles/clear/style-clear/symbols/wayside_shrine-s.svg @@ -1,21 +1,7 @@ - - - - wayside_shrine-s - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/windmill-l.svg b/data/styles/clear/style-clear/symbols/windmill-l.svg index 69aac045ad..df064b454a 100644 --- a/data/styles/clear/style-clear/symbols/windmill-l.svg +++ b/data/styles/clear/style-clear/symbols/windmill-l.svg @@ -1,19 +1,7 @@ - - - - windmill-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/windmill-m.svg b/data/styles/clear/style-clear/symbols/windmill-m.svg index c582820a56..ab87f7d9d7 100644 --- a/data/styles/clear/style-clear/symbols/windmill-m.svg +++ b/data/styles/clear/style-clear/symbols/windmill-m.svg @@ -1,19 +1,7 @@ - - - - windmill-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/windmill-s.svg b/data/styles/clear/style-clear/symbols/windmill-s.svg index 6ebfe25d72..6a44a1a91f 100644 --- a/data/styles/clear/style-clear/symbols/windmill-s.svg +++ b/data/styles/clear/style-clear/symbols/windmill-s.svg @@ -1,19 +1,7 @@ - - - - windmill-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/zero-icon.svg b/data/styles/clear/style-clear/symbols/zero-icon.svg index be099dc350..dfd18cca00 100644 --- a/data/styles/clear/style-clear/symbols/zero-icon.svg +++ b/data/styles/clear/style-clear/symbols/zero-icon.svg @@ -1,8 +1 @@ - - - - zero-icon - Created with Sketch. - - - \ No newline at end of file + diff --git a/data/styles/clear/style-clear/symbols/zoo-l.svg b/data/styles/clear/style-clear/symbols/zoo-l.svg index 7e56068649..f819b6ed85 100644 --- a/data/styles/clear/style-clear/symbols/zoo-l.svg +++ b/data/styles/clear/style-clear/symbols/zoo-l.svg @@ -1,14 +1,7 @@ - - - - zoo-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/zoo-m.svg b/data/styles/clear/style-clear/symbols/zoo-m.svg index 8e6444d647..6104b9fb19 100644 --- a/data/styles/clear/style-clear/symbols/zoo-m.svg +++ b/data/styles/clear/style-clear/symbols/zoo-m.svg @@ -1,14 +1,7 @@ - - - - zoo-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/zoo-s.svg b/data/styles/clear/style-clear/symbols/zoo-s.svg index 7e04490e1f..f23e256aa4 100644 --- a/data/styles/clear/style-clear/symbols/zoo-s.svg +++ b/data/styles/clear/style-clear/symbols/zoo-s.svg @@ -1,14 +1,7 @@ - - - - zoo-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-clear/xhdpi/search-adv.png b/data/styles/clear/style-clear/xhdpi/search-adv.png new file mode 100644 index 0000000000..2e31e3520d Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/search-adv.png differ diff --git a/data/styles/clear/style-clear/xhdpi/search-booking.png b/data/styles/clear/style-clear/xhdpi/search-booking.png index 1f7311b066..828c84a3bb 100644 Binary files a/data/styles/clear/style-clear/xhdpi/search-booking.png and b/data/styles/clear/style-clear/xhdpi/search-booking.png differ diff --git a/data/styles/clear/style-clear/xhdpi/search-result.png b/data/styles/clear/style-clear/xhdpi/search-result.png index e0cd1f84c3..88ee79bf88 100644 Binary files a/data/styles/clear/style-clear/xhdpi/search-result.png and b/data/styles/clear/style-clear/xhdpi/search-result.png differ diff --git a/data/styles/clear/style-clear/xhdpi/search-tinkoff.png b/data/styles/clear/style-clear/xhdpi/search-tinkoff.png index 841c945cb9..6abf486320 100644 Binary files a/data/styles/clear/style-clear/xhdpi/search-tinkoff.png and b/data/styles/clear/style-clear/xhdpi/search-tinkoff.png differ diff --git a/data/styles/clear/style-clear/xxhdpi/search-adv.png b/data/styles/clear/style-clear/xxhdpi/search-adv.png new file mode 100644 index 0000000000..06884a5ea6 Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/search-adv.png differ diff --git a/data/styles/clear/style-clear/xxhdpi/search-booking.png b/data/styles/clear/style-clear/xxhdpi/search-booking.png index 9baf447627..cac673de72 100644 Binary files a/data/styles/clear/style-clear/xxhdpi/search-booking.png and b/data/styles/clear/style-clear/xxhdpi/search-booking.png differ diff --git a/data/styles/clear/style-clear/xxhdpi/search-result.png b/data/styles/clear/style-clear/xxhdpi/search-result.png index dca86fed78..e17a6fec47 100644 Binary files a/data/styles/clear/style-clear/xxhdpi/search-result.png and b/data/styles/clear/style-clear/xxhdpi/search-result.png differ diff --git a/data/styles/clear/style-clear/xxhdpi/search-tinkoff.png b/data/styles/clear/style-clear/xxhdpi/search-tinkoff.png index 3f6bbda467..c8df552363 100644 Binary files a/data/styles/clear/style-clear/xxhdpi/search-tinkoff.png and b/data/styles/clear/style-clear/xxhdpi/search-tinkoff.png differ diff --git a/data/styles/clear/style-night/6plus/search-adv.png b/data/styles/clear/style-night/6plus/search-adv.png new file mode 100644 index 0000000000..cb2f920e4f Binary files /dev/null and b/data/styles/clear/style-night/6plus/search-adv.png differ diff --git a/data/styles/clear/style-night/6plus/search-booking.png b/data/styles/clear/style-night/6plus/search-booking.png index f447d989e9..183f8fb86b 100644 Binary files a/data/styles/clear/style-night/6plus/search-booking.png and b/data/styles/clear/style-night/6plus/search-booking.png differ diff --git a/data/styles/clear/style-night/6plus/search-result.png b/data/styles/clear/style-night/6plus/search-result.png index 6e22c1f965..ff8937fbb6 100644 Binary files a/data/styles/clear/style-night/6plus/search-result.png and b/data/styles/clear/style-night/6plus/search-result.png differ diff --git a/data/styles/clear/style-night/6plus/search-tinkoff.png b/data/styles/clear/style-night/6plus/search-tinkoff.png index 2f7aeda1f8..381441362d 100644 Binary files a/data/styles/clear/style-night/6plus/search-tinkoff.png and b/data/styles/clear/style-night/6plus/search-tinkoff.png differ diff --git a/data/styles/clear/style-night/hdpi/search-adv.png b/data/styles/clear/style-night/hdpi/search-adv.png new file mode 100644 index 0000000000..a2e8ceda5a Binary files /dev/null and b/data/styles/clear/style-night/hdpi/search-adv.png differ diff --git a/data/styles/clear/style-night/hdpi/search-booking.png b/data/styles/clear/style-night/hdpi/search-booking.png index 8dea040f12..bd2bd04a55 100644 Binary files a/data/styles/clear/style-night/hdpi/search-booking.png and b/data/styles/clear/style-night/hdpi/search-booking.png differ diff --git a/data/styles/clear/style-night/hdpi/search-result.png b/data/styles/clear/style-night/hdpi/search-result.png index fd59f0fe1e..d9071790b4 100644 Binary files a/data/styles/clear/style-night/hdpi/search-result.png and b/data/styles/clear/style-night/hdpi/search-result.png differ diff --git a/data/styles/clear/style-night/hdpi/search-tinkoff.png b/data/styles/clear/style-night/hdpi/search-tinkoff.png index c4148412ee..edc3d68c52 100644 Binary files a/data/styles/clear/style-night/hdpi/search-tinkoff.png and b/data/styles/clear/style-night/hdpi/search-tinkoff.png differ diff --git a/data/styles/clear/style-night/mdpi/search-adv.png b/data/styles/clear/style-night/mdpi/search-adv.png new file mode 100644 index 0000000000..e518192184 Binary files /dev/null and b/data/styles/clear/style-night/mdpi/search-adv.png differ diff --git a/data/styles/clear/style-night/mdpi/search-booking.png b/data/styles/clear/style-night/mdpi/search-booking.png index b2d10a085d..d8fd990d7e 100644 Binary files a/data/styles/clear/style-night/mdpi/search-booking.png and b/data/styles/clear/style-night/mdpi/search-booking.png differ diff --git a/data/styles/clear/style-night/mdpi/search-result.png b/data/styles/clear/style-night/mdpi/search-result.png index 2cad0e012b..e29c0527f1 100644 Binary files a/data/styles/clear/style-night/mdpi/search-result.png and b/data/styles/clear/style-night/mdpi/search-result.png differ diff --git a/data/styles/clear/style-night/mdpi/search-tinkoff.png b/data/styles/clear/style-night/mdpi/search-tinkoff.png index 91bf8e4280..e0d61f1f5a 100644 Binary files a/data/styles/clear/style-night/mdpi/search-tinkoff.png and b/data/styles/clear/style-night/mdpi/search-tinkoff.png differ diff --git a/data/styles/clear/style-night/symbols-ad/02001_hospital-l.svg b/data/styles/clear/style-night/symbols-ad/02001_hospital-l.svg new file mode 100644 index 0000000000..5027d351f5 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/02001_hospital-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/02002_veterinary-l.svg b/data/styles/clear/style-night/symbols-ad/02002_veterinary-l.svg new file mode 100644 index 0000000000..da5a96f84c --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/02002_veterinary-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/02003_pharmacy-l.svg b/data/styles/clear/style-night/symbols-ad/02003_pharmacy-l.svg new file mode 100644 index 0000000000..dbd0351e14 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/02003_pharmacy-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/03001_restaurant-l.svg b/data/styles/clear/style-night/symbols-ad/03001_restaurant-l.svg new file mode 100644 index 0000000000..fb5417d6d4 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/03001_restaurant-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/03002_bar-l.svg b/data/styles/clear/style-night/symbols-ad/03002_bar-l.svg new file mode 100644 index 0000000000..e498fbe5f7 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/03002_bar-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/03003_beer-l.svg b/data/styles/clear/style-night/symbols-ad/03003_beer-l.svg new file mode 100644 index 0000000000..bc03bb0c21 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/03003_beer-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/03004_fastfood-l.svg b/data/styles/clear/style-night/symbols-ad/03004_fastfood-l.svg new file mode 100644 index 0000000000..6220578279 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/03004_fastfood-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/03005_cafe-l.svg b/data/styles/clear/style-night/symbols-ad/03005_cafe-l.svg new file mode 100644 index 0000000000..48dd9fa1e7 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/03005_cafe-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/04001_tourism-l.svg b/data/styles/clear/style-night/symbols-ad/04001_tourism-l.svg new file mode 100644 index 0000000000..f7f616f20c --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/04001_tourism-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/04002_viewpoint-l.svg b/data/styles/clear/style-night/symbols-ad/04002_viewpoint-l.svg new file mode 100644 index 0000000000..4980ae5aa9 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/04002_viewpoint-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/04004_museum-l.svg b/data/styles/clear/style-night/symbols-ad/04004_museum-l.svg new file mode 100644 index 0000000000..15d6331202 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/04004_museum-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/04005_gallery-l.svg b/data/styles/clear/style-night/symbols-ad/04005_gallery-l.svg new file mode 100644 index 0000000000..f867e99aa8 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/04005_gallery-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/04006_zoo-l.svg b/data/styles/clear/style-night/symbols-ad/04006_zoo-l.svg new file mode 100644 index 0000000000..b87f72fb23 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/04006_zoo-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/04007_theatre-l.svg b/data/styles/clear/style-night/symbols-ad/04007_theatre-l.svg new file mode 100644 index 0000000000..a5d5163f35 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/04007_theatre-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/04008_cinema-l.svg b/data/styles/clear/style-night/symbols-ad/04008_cinema-l.svg new file mode 100644 index 0000000000..1a5871e8a2 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/04008_cinema-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/04009_casino-l.svg b/data/styles/clear/style-night/symbols-ad/04009_casino-l.svg new file mode 100644 index 0000000000..c44ebf7870 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/04009_casino-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/04010_toilets-l.svg b/data/styles/clear/style-night/symbols-ad/04010_toilets-l.svg new file mode 100644 index 0000000000..a0295b4adb --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/04010_toilets-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/04021_stadium-l.svg b/data/styles/clear/style-night/symbols-ad/04021_stadium-l.svg new file mode 100644 index 0000000000..b5655b90fb --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/04021_stadium-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/05001_hotel-l.svg b/data/styles/clear/style-night/symbols-ad/05001_hotel-l.svg new file mode 100644 index 0000000000..e6b95e8cd1 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/05001_hotel-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/05002_motel-l.svg b/data/styles/clear/style-night/symbols-ad/05002_motel-l.svg new file mode 100644 index 0000000000..29b0135dae --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/05002_motel-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/05003_alpine_hut-l.svg b/data/styles/clear/style-night/symbols-ad/05003_alpine_hut-l.svg new file mode 100644 index 0000000000..6bce822e16 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/05003_alpine_hut-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/05004_caravan_site-l.svg b/data/styles/clear/style-night/symbols-ad/05004_caravan_site-l.svg new file mode 100644 index 0000000000..ed318fbe4f --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/05004_caravan_site-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/05005_apartment-l.svg b/data/styles/clear/style-night/symbols-ad/05005_apartment-l.svg new file mode 100644 index 0000000000..94a83f90fb --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/05005_apartment-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/05006_hostel-l.svg b/data/styles/clear/style-night/symbols-ad/05006_hostel-l.svg new file mode 100644 index 0000000000..7aefddaa9a --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/05006_hostel-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06001_convenience-l.svg b/data/styles/clear/style-night/symbols-ad/06001_convenience-l.svg new file mode 100644 index 0000000000..7afdcad71e --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06001_convenience-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06002_marketplace-l.svg b/data/styles/clear/style-night/symbols-ad/06002_marketplace-l.svg new file mode 100644 index 0000000000..ffe8a2b079 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06002_marketplace-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06003_kiosk-l.svg b/data/styles/clear/style-night/symbols-ad/06003_kiosk-l.svg new file mode 100644 index 0000000000..639628b4d6 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06003_kiosk-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06004_grocery-l.svg b/data/styles/clear/style-night/symbols-ad/06004_grocery-l.svg new file mode 100644 index 0000000000..9f9c0a2576 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06004_grocery-l.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06005_shop-l.svg b/data/styles/clear/style-night/symbols-ad/06005_shop-l.svg new file mode 100644 index 0000000000..0078e0798e --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06005_shop-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06006_department_store-l.svg b/data/styles/clear/style-night/symbols-ad/06006_department_store-l.svg new file mode 100644 index 0000000000..a07c06d42d --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06006_department_store-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06007_electronics-l.svg b/data/styles/clear/style-night/symbols-ad/06007_electronics-l.svg new file mode 100644 index 0000000000..2d5b09b0d5 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06007_electronics-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06008_florist-l.svg b/data/styles/clear/style-night/symbols-ad/06008_florist-l.svg new file mode 100644 index 0000000000..06bda6a5a4 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06008_florist-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06009_shop-bicycle-l.svg b/data/styles/clear/style-night/symbols-ad/06009_shop-bicycle-l.svg new file mode 100644 index 0000000000..a123f57e33 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06009_shop-bicycle-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06010_jewelry-l.svg b/data/styles/clear/style-night/symbols-ad/06010_jewelry-l.svg new file mode 100644 index 0000000000..b94f9134eb --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06010_jewelry-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06011_beauty-l.svg b/data/styles/clear/style-night/symbols-ad/06011_beauty-l.svg new file mode 100644 index 0000000000..640f54c995 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06011_beauty-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06012_bakery-l.svg b/data/styles/clear/style-night/symbols-ad/06012_bakery-l.svg new file mode 100644 index 0000000000..c0c74370ce --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06012_bakery-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06013_gift-l.svg b/data/styles/clear/style-night/symbols-ad/06013_gift-l.svg new file mode 100644 index 0000000000..bbe2ae0eea --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06013_gift-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06014_furniture-l.svg b/data/styles/clear/style-night/symbols-ad/06014_furniture-l.svg new file mode 100644 index 0000000000..4c99bd3143 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06014_furniture-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06015_garden_center-l.svg b/data/styles/clear/style-night/symbols-ad/06015_garden_center-l.svg new file mode 100644 index 0000000000..9fcb947de4 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06015_garden_center-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06016_greengrocer-l.svg b/data/styles/clear/style-night/symbols-ad/06016_greengrocer-l.svg new file mode 100644 index 0000000000..b3e2f0df0a --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06016_greengrocer-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06017_shoes-l.svg b/data/styles/clear/style-night/symbols-ad/06017_shoes-l.svg new file mode 100644 index 0000000000..25adfd76fd --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06017_shoes-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06018_computer-l.svg b/data/styles/clear/style-night/symbols-ad/06018_computer-l.svg new file mode 100644 index 0000000000..a9c997cf18 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06018_computer-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06019_hardware-l.svg b/data/styles/clear/style-night/symbols-ad/06019_hardware-l.svg new file mode 100644 index 0000000000..41e2219b83 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06019_hardware-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06020_doityourself-l.svg b/data/styles/clear/style-night/symbols-ad/06020_doityourself-l.svg new file mode 100644 index 0000000000..a2f0a23821 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06020_doityourself-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06021_sweets-l.svg b/data/styles/clear/style-night/symbols-ad/06021_sweets-l.svg new file mode 100644 index 0000000000..921c28b05b --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06021_sweets-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06022_toys-l.svg b/data/styles/clear/style-night/symbols-ad/06022_toys-l.svg new file mode 100644 index 0000000000..06d76d9a44 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06022_toys-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06023_butcher-l.svg b/data/styles/clear/style-night/symbols-ad/06023_butcher-l.svg new file mode 100644 index 0000000000..f4d80162fc --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06023_butcher-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06024_mobile_phone-l.svg b/data/styles/clear/style-night/symbols-ad/06024_mobile_phone-l.svg new file mode 100644 index 0000000000..9fdaed2499 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06024_mobile_phone-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06025_optician-l.svg b/data/styles/clear/style-night/symbols-ad/06025_optician-l.svg new file mode 100644 index 0000000000..866306a00c --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06025_optician-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06026_sports-l.svg b/data/styles/clear/style-night/symbols-ad/06026_sports-l.svg new file mode 100644 index 0000000000..eeb0a8bbd0 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06026_sports-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06027_chemist-l.svg b/data/styles/clear/style-night/symbols-ad/06027_chemist-l.svg new file mode 100644 index 0000000000..056fe0c74c --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06027_chemist-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06028_clothes-l.svg b/data/styles/clear/style-night/symbols-ad/06028_clothes-l.svg new file mode 100644 index 0000000000..bf22a61fcb --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06028_clothes-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06029_book-shop-l.svg b/data/styles/clear/style-night/symbols-ad/06029_book-shop-l.svg new file mode 100644 index 0000000000..9dc85df17e --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06029_book-shop-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06030_petshop-l.svg b/data/styles/clear/style-night/symbols-ad/06030_petshop-l.svg new file mode 100644 index 0000000000..f7d8c91407 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06030_petshop-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06031_photo-shop-l.svg b/data/styles/clear/style-night/symbols-ad/06031_photo-shop-l.svg new file mode 100644 index 0000000000..1a0e049797 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06031_photo-shop-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06032_copyshop-l.svg b/data/styles/clear/style-night/symbols-ad/06032_copyshop-l.svg new file mode 100644 index 0000000000..aa4361c2dc --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06032_copyshop-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06033_seafood-shop-l.svg b/data/styles/clear/style-night/symbols-ad/06033_seafood-shop-l.svg new file mode 100644 index 0000000000..2401380571 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06033_seafood-shop-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06034_ticket-shop-l.svg b/data/styles/clear/style-night/symbols-ad/06034_ticket-shop-l.svg new file mode 100644 index 0000000000..bc4bed7641 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06034_ticket-shop-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06035_outdoor-shop-l.svg b/data/styles/clear/style-night/symbols-ad/06035_outdoor-shop-l.svg new file mode 100644 index 0000000000..8fb40a8c49 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06035_outdoor-shop-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06036_alcohol-l.svg b/data/styles/clear/style-night/symbols-ad/06036_alcohol-l.svg new file mode 100644 index 0000000000..aeda653283 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06036_alcohol-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06037_hand-l.svg b/data/styles/clear/style-night/symbols-ad/06037_hand-l.svg new file mode 100644 index 0000000000..fec1f7da4e --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06037_hand-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06038_car_shop-l.svg b/data/styles/clear/style-night/symbols-ad/06038_car_shop-l.svg new file mode 100644 index 0000000000..4aa195b1f7 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06038_car_shop-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06039_motorcycle_shop-l.svg b/data/styles/clear/style-night/symbols-ad/06039_motorcycle_shop-l.svg new file mode 100644 index 0000000000..308e449257 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06039_motorcycle_shop-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/06040_travel_agency_shop-l.svg b/data/styles/clear/style-night/symbols-ad/06040_travel_agency_shop-l.svg new file mode 100644 index 0000000000..037da62e3d --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/06040_travel_agency_shop-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/07001_atm-l.svg b/data/styles/clear/style-night/symbols-ad/07001_atm-l.svg new file mode 100644 index 0000000000..8c34f061e5 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/07001_atm-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/07002_bank-l.svg b/data/styles/clear/style-night/symbols-ad/07002_bank-l.svg new file mode 100644 index 0000000000..34d102473c --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/07002_bank-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/07003_banknote-l.svg b/data/styles/clear/style-night/symbols-ad/07003_banknote-l.svg new file mode 100644 index 0000000000..5f4dea678c --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/07003_banknote-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/08001_fuel-l.svg b/data/styles/clear/style-night/symbols-ad/08001_fuel-l.svg new file mode 100644 index 0000000000..7e75b26603 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/08001_fuel-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/08002_charging-station-l.svg b/data/styles/clear/style-night/symbols-ad/08002_charging-station-l.svg new file mode 100644 index 0000000000..ecb453ccbb --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/08002_charging-station-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/08003_car-repair-l.svg b/data/styles/clear/style-night/symbols-ad/08003_car-repair-l.svg new file mode 100644 index 0000000000..e1567470ec --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/08003_car-repair-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/08004_tire-repair-l.svg b/data/styles/clear/style-night/symbols-ad/08004_tire-repair-l.svg new file mode 100644 index 0000000000..bb42531913 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/08004_tire-repair-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/08005_car-sharing-l.svg b/data/styles/clear/style-night/symbols-ad/08005_car-sharing-l.svg new file mode 100644 index 0000000000..dd0ed867d5 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/08005_car-sharing-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/08006_car-part-l.svg b/data/styles/clear/style-night/symbols-ad/08006_car-part-l.svg new file mode 100644 index 0000000000..aae728c106 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/08006_car-part-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/08007_car-wash-l.svg b/data/styles/clear/style-night/symbols-ad/08007_car-wash-l.svg new file mode 100644 index 0000000000..de3cfd4c58 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/08007_car-wash-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/09001_bicycle-l.svg b/data/styles/clear/style-night/symbols-ad/09001_bicycle-l.svg new file mode 100644 index 0000000000..5548ee12f6 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/09001_bicycle-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/09002_swimming-l.svg b/data/styles/clear/style-night/symbols-ad/09002_swimming-l.svg new file mode 100644 index 0000000000..a03b727a7e --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/09002_swimming-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/09003_baseball-l.svg b/data/styles/clear/style-night/symbols-ad/09003_baseball-l.svg new file mode 100644 index 0000000000..6b1547d15a --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/09003_baseball-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/09004_tennis-l.svg b/data/styles/clear/style-night/symbols-ad/09004_tennis-l.svg new file mode 100644 index 0000000000..de19ba34fb --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/09004_tennis-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/09005_basketball-l.svg b/data/styles/clear/style-night/symbols-ad/09005_basketball-l.svg new file mode 100644 index 0000000000..2d6fb460a6 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/09005_basketball-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/09006_america-football-l.svg b/data/styles/clear/style-night/symbols-ad/09006_america-football-l.svg new file mode 100644 index 0000000000..48bae22572 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/09006_america-football-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/09007_soccer-l.svg b/data/styles/clear/style-night/symbols-ad/09007_soccer-l.svg new file mode 100644 index 0000000000..26102fdb91 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/09007_soccer-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/09008_golf-l.svg b/data/styles/clear/style-night/symbols-ad/09008_golf-l.svg new file mode 100644 index 0000000000..32f440bb5e --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/09008_golf-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/09009_pitch-l.svg b/data/styles/clear/style-night/symbols-ad/09009_pitch-l.svg new file mode 100644 index 0000000000..4ddd1efbc6 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/09009_pitch-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/09010_skiing-l.svg b/data/styles/clear/style-night/symbols-ad/09010_skiing-l.svg new file mode 100644 index 0000000000..6a1582cd54 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/09010_skiing-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/09011_cricket-l.svg b/data/styles/clear/style-night/symbols-ad/09011_cricket-l.svg new file mode 100644 index 0000000000..1d69810a6c --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/09011_cricket-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/09012_bowls-l.svg b/data/styles/clear/style-night/symbols-ad/09012_bowls-l.svg new file mode 100644 index 0000000000..8c35c2aa27 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/09012_bowls-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/09013_curling-l.svg b/data/styles/clear/style-night/symbols-ad/09013_curling-l.svg new file mode 100644 index 0000000000..78ed9f0540 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/09013_curling-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/09014_diving-l.svg b/data/styles/clear/style-night/symbols-ad/09014_diving-l.svg new file mode 100644 index 0000000000..aabee9a6cf --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/09014_diving-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/09015_archery-l.svg b/data/styles/clear/style-night/symbols-ad/09015_archery-l.svg new file mode 100644 index 0000000000..d710e7a0fd --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/09015_archery-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/09016_australian-football-l.svg b/data/styles/clear/style-night/symbols-ad/09016_australian-football-l.svg new file mode 100644 index 0000000000..bcd6924619 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/09016_australian-football-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/09017_climbing-l.svg b/data/styles/clear/style-night/symbols-ad/09017_climbing-l.svg new file mode 100644 index 0000000000..b1c8a0a121 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/09017_climbing-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/09018_gym-l.svg b/data/styles/clear/style-night/symbols-ad/09018_gym-l.svg new file mode 100644 index 0000000000..83cf5d0423 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/09018_gym-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/09019_equestrian-l.svg b/data/styles/clear/style-night/symbols-ad/09019_equestrian-l.svg new file mode 100644 index 0000000000..ce8100559c --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/09019_equestrian-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/0_test.svg b/data/styles/clear/style-night/symbols-ad/0_test.svg deleted file mode 100644 index 2f1ac91ac9..0000000000 --- a/data/styles/clear/style-night/symbols-ad/0_test.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/data/styles/clear/style-night/symbols-ad/10001_kindergarten-l.svg b/data/styles/clear/style-night/symbols-ad/10001_kindergarten-l.svg new file mode 100644 index 0000000000..a8056d2792 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/10001_kindergarten-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/10002_school-l.svg b/data/styles/clear/style-night/symbols-ad/10002_school-l.svg new file mode 100644 index 0000000000..d5fc4b027e --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/10002_school-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/10003_college-l.svg b/data/styles/clear/style-night/symbols-ad/10003_college-l.svg new file mode 100644 index 0000000000..88145cd0e0 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/10003_college-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/10004_library-l.svg b/data/styles/clear/style-night/symbols-ad/10004_library-l.svg new file mode 100644 index 0000000000..c9f059e140 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/10004_library-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/10005_mail-l.svg b/data/styles/clear/style-night/symbols-ad/10005_mail-l.svg new file mode 100644 index 0000000000..3ad922f2fb --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/10005_mail-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/10008_historic-ship-l.svg b/data/styles/clear/style-night/symbols-ad/10008_historic-ship-l.svg new file mode 100644 index 0000000000..360a20cbf2 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/10008_historic-ship-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/10012_public-building-l.svg b/data/styles/clear/style-night/symbols-ad/10012_public-building-l.svg new file mode 100644 index 0000000000..16e2c83e26 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/10012_public-building-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/10013_hairdresser-l.svg b/data/styles/clear/style-night/symbols-ad/10013_hairdresser-l.svg new file mode 100644 index 0000000000..f6f88e5b36 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/10013_hairdresser-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/10014_taxi-l.svg b/data/styles/clear/style-night/symbols-ad/10014_taxi-l.svg new file mode 100644 index 0000000000..6b57a95a0c --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/10014_taxi-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/10015_office-l.svg b/data/styles/clear/style-night/symbols-ad/10015_office-l.svg new file mode 100644 index 0000000000..f87f174ce5 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/10015_office-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/10016_remains-l.svg b/data/styles/clear/style-night/symbols-ad/10016_remains-l.svg new file mode 100644 index 0000000000..48adef5126 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/10016_remains-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/10017_lighthouse-l.svg b/data/styles/clear/style-night/symbols-ad/10017_lighthouse-l.svg new file mode 100644 index 0000000000..d878ae5a3f --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/10017_lighthouse-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/10022_laundry-l.svg b/data/styles/clear/style-night/symbols-ad/10022_laundry-l.svg new file mode 100644 index 0000000000..9985bc629e --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/10022_laundry-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/10024_dentist-l.svg b/data/styles/clear/style-night/symbols-ad/10024_dentist-l.svg new file mode 100644 index 0000000000..945844f846 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/10024_dentist-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/10025_bookmaker-l.svg b/data/styles/clear/style-night/symbols-ad/10025_bookmaker-l.svg new file mode 100644 index 0000000000..c5ed2b3472 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/10025_bookmaker-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/10026_lawyer-l.svg b/data/styles/clear/style-night/symbols-ad/10026_lawyer-l.svg new file mode 100644 index 0000000000..51bd724287 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/10026_lawyer-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/10027_sauna-l.svg b/data/styles/clear/style-night/symbols-ad/10027_sauna-l.svg new file mode 100644 index 0000000000..b2380fe28b --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/10027_sauna-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/10028_picnic-l.svg b/data/styles/clear/style-night/symbols-ad/10028_picnic-l.svg new file mode 100644 index 0000000000..aa209e6526 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/10028_picnic-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/10029_campsite-l.svg b/data/styles/clear/style-night/symbols-ad/10029_campsite-l.svg new file mode 100644 index 0000000000..920977f9de --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/10029_campsite-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/10030_hunting-tower-l.svg b/data/styles/clear/style-night/symbols-ad/10030_hunting-tower-l.svg new file mode 100644 index 0000000000..dd65115d64 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/10030_hunting-tower-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/10031_bbq-l.svg b/data/styles/clear/style-night/symbols-ad/10031_bbq-l.svg new file mode 100644 index 0000000000..3f85ba4641 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/10031_bbq-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/10032_cemetery-l.svg b/data/styles/clear/style-night/symbols-ad/10032_cemetery-l.svg new file mode 100644 index 0000000000..7bd07bfd0b --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/10032_cemetery-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/10033_beach-l.svg b/data/styles/clear/style-night/symbols-ad/10033_beach-l.svg new file mode 100644 index 0000000000..753267fbdd --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/10033_beach-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols-ad/10034_dog_park-l.svg b/data/styles/clear/style-night/symbols-ad/10034_dog_park-l.svg new file mode 100644 index 0000000000..51b48b1478 --- /dev/null +++ b/data/styles/clear/style-night/symbols-ad/10034_dog_park-l.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/airport-l.svg b/data/styles/clear/style-night/symbols/airport-l.svg index 0b7233b8a2..fec0064e7f 100644 --- a/data/styles/clear/style-night/symbols/airport-l.svg +++ b/data/styles/clear/style-night/symbols/airport-l.svg @@ -1,22 +1,7 @@ - - - - airport-l - Created with Sketch. - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/airport-m.svg b/data/styles/clear/style-night/symbols/airport-m.svg index b7ef523e6f..b5a931d26a 100644 --- a/data/styles/clear/style-night/symbols/airport-m.svg +++ b/data/styles/clear/style-night/symbols/airport-m.svg @@ -1,18 +1,7 @@ - - - - airport-m - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/airport-s.svg b/data/styles/clear/style-night/symbols/airport-s.svg index f6afb9cb71..45f5a5de71 100644 --- a/data/styles/clear/style-night/symbols/airport-s.svg +++ b/data/styles/clear/style-night/symbols/airport-s.svg @@ -1,18 +1,7 @@ - - - - airport-s - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/alcohol-l.svg b/data/styles/clear/style-night/symbols/alcohol-l.svg index 6edfa70208..78ea3869a5 100644 --- a/data/styles/clear/style-night/symbols/alcohol-l.svg +++ b/data/styles/clear/style-night/symbols/alcohol-l.svg @@ -1,20 +1,7 @@ - - - - alcohol-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/alcohol-m.svg b/data/styles/clear/style-night/symbols/alcohol-m.svg index 90496f05f0..03d4602d02 100644 --- a/data/styles/clear/style-night/symbols/alcohol-m.svg +++ b/data/styles/clear/style-night/symbols/alcohol-m.svg @@ -1,20 +1,7 @@ - - - - alcohol-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/alcohol-s.svg b/data/styles/clear/style-night/symbols/alcohol-s.svg index 89affe6aba..5e7b99b6f9 100644 --- a/data/styles/clear/style-night/symbols/alcohol-s.svg +++ b/data/styles/clear/style-night/symbols/alcohol-s.svg @@ -1,20 +1,7 @@ - - - - alcohol-s - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/alpine_hut-l.svg b/data/styles/clear/style-night/symbols/alpine_hut-l.svg index aad016c1da..ebf5a9454a 100644 --- a/data/styles/clear/style-night/symbols/alpine_hut-l.svg +++ b/data/styles/clear/style-night/symbols/alpine_hut-l.svg @@ -1,16 +1,7 @@ - - - - alpine_hut-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/alpine_hut-m.svg b/data/styles/clear/style-night/symbols/alpine_hut-m.svg index dfb25f1bab..b553f97785 100644 --- a/data/styles/clear/style-night/symbols/alpine_hut-m.svg +++ b/data/styles/clear/style-night/symbols/alpine_hut-m.svg @@ -1,16 +1,7 @@ - - - - alpine_hut-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/alpine_hut-s.svg b/data/styles/clear/style-night/symbols/alpine_hut-s.svg index c31892c2c3..021a57a51a 100644 --- a/data/styles/clear/style-night/symbols/alpine_hut-s.svg +++ b/data/styles/clear/style-night/symbols/alpine_hut-s.svg @@ -1,14 +1,7 @@ - - - - alpine_hut-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/america-football-l.svg b/data/styles/clear/style-night/symbols/america-football-l.svg index 57c7c9540a..1f88a49fb9 100644 --- a/data/styles/clear/style-night/symbols/america-football-l.svg +++ b/data/styles/clear/style-night/symbols/america-football-l.svg @@ -1,14 +1,7 @@ - - - - america-football-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/america-football-m.svg b/data/styles/clear/style-night/symbols/america-football-m.svg index 8c13f40d2d..6abcbc90b5 100644 --- a/data/styles/clear/style-night/symbols/america-football-m.svg +++ b/data/styles/clear/style-night/symbols/america-football-m.svg @@ -1,14 +1,7 @@ - - - - america-football-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/america-football-s.svg b/data/styles/clear/style-night/symbols/america-football-s.svg index 6d61949abd..4e1a8c7667 100644 --- a/data/styles/clear/style-night/symbols/america-football-s.svg +++ b/data/styles/clear/style-night/symbols/america-football-s.svg @@ -1,14 +1,7 @@ - - - - america-football-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/apartment-l.svg b/data/styles/clear/style-night/symbols/apartment-l.svg new file mode 100644 index 0000000000..5f58bcf106 --- /dev/null +++ b/data/styles/clear/style-night/symbols/apartment-l.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/apartment-m.svg b/data/styles/clear/style-night/symbols/apartment-m.svg new file mode 100644 index 0000000000..91e371c707 --- /dev/null +++ b/data/styles/clear/style-night/symbols/apartment-m.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/apartment-s.svg b/data/styles/clear/style-night/symbols/apartment-s.svg new file mode 100644 index 0000000000..d1f030fe0d --- /dev/null +++ b/data/styles/clear/style-night/symbols/apartment-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/archery-l.svg b/data/styles/clear/style-night/symbols/archery-l.svg index d55cafc518..e7bae87506 100644 --- a/data/styles/clear/style-night/symbols/archery-l.svg +++ b/data/styles/clear/style-night/symbols/archery-l.svg @@ -1,14 +1,7 @@ - - - - archery-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/archery-m.svg b/data/styles/clear/style-night/symbols/archery-m.svg index a8ddb6342d..95ad6de447 100644 --- a/data/styles/clear/style-night/symbols/archery-m.svg +++ b/data/styles/clear/style-night/symbols/archery-m.svg @@ -1,14 +1,7 @@ - - - - archery-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/archery-s.svg b/data/styles/clear/style-night/symbols/archery-s.svg index a151f53902..f8536bfc09 100644 --- a/data/styles/clear/style-night/symbols/archery-s.svg +++ b/data/styles/clear/style-night/symbols/archery-s.svg @@ -1,14 +1,7 @@ - - - - archery-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/arrow-m.svg b/data/styles/clear/style-night/symbols/arrow-m.svg index 0255bb6f73..8c67dd17da 100644 --- a/data/styles/clear/style-night/symbols/arrow-m.svg +++ b/data/styles/clear/style-night/symbols/arrow-m.svg @@ -1,12 +1,3 @@ - - - - arrow-m - Created with Sketch. - - - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-night/symbols/arrow-s.svg b/data/styles/clear/style-night/symbols/arrow-s.svg index b289e4e671..d5b31a1e9a 100644 --- a/data/styles/clear/style-night/symbols/arrow-s.svg +++ b/data/styles/clear/style-night/symbols/arrow-s.svg @@ -1,12 +1,3 @@ - - - - arrow-s - Created with Sketch. - - - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-night/symbols/arrow-xs.svg b/data/styles/clear/style-night/symbols/arrow-xs.svg index d020789d20..9b755a8a8d 100644 --- a/data/styles/clear/style-night/symbols/arrow-xs.svg +++ b/data/styles/clear/style-night/symbols/arrow-xs.svg @@ -1,14 +1,3 @@ - - - - arrow-xs - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-night/symbols/atm-l.svg b/data/styles/clear/style-night/symbols/atm-l.svg index 215e7aa7fe..3afc4341e1 100644 --- a/data/styles/clear/style-night/symbols/atm-l.svg +++ b/data/styles/clear/style-night/symbols/atm-l.svg @@ -1,16 +1,7 @@ - - - - atm-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/atm-m.svg b/data/styles/clear/style-night/symbols/atm-m.svg index 4fa7471c95..c08f43fbe6 100644 --- a/data/styles/clear/style-night/symbols/atm-m.svg +++ b/data/styles/clear/style-night/symbols/atm-m.svg @@ -1,16 +1,7 @@ - - - - atm-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/atm-s.svg b/data/styles/clear/style-night/symbols/atm-s.svg index c8115caac7..ace2428f56 100644 --- a/data/styles/clear/style-night/symbols/atm-s.svg +++ b/data/styles/clear/style-night/symbols/atm-s.svg @@ -1,16 +1,7 @@ - - - - atm-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/australian-football-l.svg b/data/styles/clear/style-night/symbols/australian-football-l.svg index 3e13c0d276..944fab8b58 100644 --- a/data/styles/clear/style-night/symbols/australian-football-l.svg +++ b/data/styles/clear/style-night/symbols/australian-football-l.svg @@ -1,14 +1,7 @@ - - - - australian-football-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/australian-football-m.svg b/data/styles/clear/style-night/symbols/australian-football-m.svg index a468f18a1b..9abbb7e4cc 100644 --- a/data/styles/clear/style-night/symbols/australian-football-m.svg +++ b/data/styles/clear/style-night/symbols/australian-football-m.svg @@ -1,14 +1,7 @@ - - - - australian-football-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/australian-football-s.svg b/data/styles/clear/style-night/symbols/australian-football-s.svg index 4f4433c442..a45d529830 100644 --- a/data/styles/clear/style-night/symbols/australian-football-s.svg +++ b/data/styles/clear/style-night/symbols/australian-football-s.svg @@ -1,14 +1,7 @@ - - - - australian-football-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bakery-l.svg b/data/styles/clear/style-night/symbols/bakery-l.svg index 2e34acacf8..14b970c95a 100644 --- a/data/styles/clear/style-night/symbols/bakery-l.svg +++ b/data/styles/clear/style-night/symbols/bakery-l.svg @@ -1,20 +1,7 @@ - - - - bakery-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bakery-m.svg b/data/styles/clear/style-night/symbols/bakery-m.svg index aca4a19e2b..550dc27871 100644 --- a/data/styles/clear/style-night/symbols/bakery-m.svg +++ b/data/styles/clear/style-night/symbols/bakery-m.svg @@ -1,20 +1,7 @@ - - - - bakery-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bakery-s.svg b/data/styles/clear/style-night/symbols/bakery-s.svg new file mode 100644 index 0000000000..f7c6cf6644 --- /dev/null +++ b/data/styles/clear/style-night/symbols/bakery-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bank-l.svg b/data/styles/clear/style-night/symbols/bank-l.svg index a43cf2aa40..2493fc1ec6 100644 --- a/data/styles/clear/style-night/symbols/bank-l.svg +++ b/data/styles/clear/style-night/symbols/bank-l.svg @@ -1,16 +1,7 @@ - - - - bank-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bank-m.svg b/data/styles/clear/style-night/symbols/bank-m.svg index 533f0ebb5c..52c8e3b36e 100644 --- a/data/styles/clear/style-night/symbols/bank-m.svg +++ b/data/styles/clear/style-night/symbols/bank-m.svg @@ -1,16 +1,7 @@ - - - - bank-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bank-s.svg b/data/styles/clear/style-night/symbols/bank-s.svg index 2c3c7c8aa3..a454c9fa76 100644 --- a/data/styles/clear/style-night/symbols/bank-s.svg +++ b/data/styles/clear/style-night/symbols/bank-s.svg @@ -1,16 +1,7 @@ - - - - bank-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/banknote-l.svg b/data/styles/clear/style-night/symbols/banknote-l.svg index 5b0c573945..7973bd1bd0 100644 --- a/data/styles/clear/style-night/symbols/banknote-l.svg +++ b/data/styles/clear/style-night/symbols/banknote-l.svg @@ -1,15 +1,7 @@ - - - - banknote-l - Created with Sketch. - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/banknote-m.svg b/data/styles/clear/style-night/symbols/banknote-m.svg index 128a0d3b1a..c310aa1c5e 100644 --- a/data/styles/clear/style-night/symbols/banknote-m.svg +++ b/data/styles/clear/style-night/symbols/banknote-m.svg @@ -1,23 +1,7 @@ - - - - banknote-m - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/banknote-s.svg b/data/styles/clear/style-night/symbols/banknote-s.svg new file mode 100644 index 0000000000..5220bbcb16 --- /dev/null +++ b/data/styles/clear/style-night/symbols/banknote-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bar-l.svg b/data/styles/clear/style-night/symbols/bar-l.svg index e9c2cb0961..d1f876d794 100644 --- a/data/styles/clear/style-night/symbols/bar-l.svg +++ b/data/styles/clear/style-night/symbols/bar-l.svg @@ -1,16 +1,7 @@ - - - - bar-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bar-m.svg b/data/styles/clear/style-night/symbols/bar-m.svg index 5f0a15d9a1..33f264a409 100644 --- a/data/styles/clear/style-night/symbols/bar-m.svg +++ b/data/styles/clear/style-night/symbols/bar-m.svg @@ -1,16 +1,7 @@ - - - - bar-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bar-s.svg b/data/styles/clear/style-night/symbols/bar-s.svg index c9228f9934..8943b75e97 100644 --- a/data/styles/clear/style-night/symbols/bar-s.svg +++ b/data/styles/clear/style-night/symbols/bar-s.svg @@ -1,16 +1,7 @@ - - - - bar-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/baseball-l.svg b/data/styles/clear/style-night/symbols/baseball-l.svg index 5649b3fbc3..9d573844e2 100644 --- a/data/styles/clear/style-night/symbols/baseball-l.svg +++ b/data/styles/clear/style-night/symbols/baseball-l.svg @@ -1,14 +1,7 @@ - - - - baseball-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/baseball-m.svg b/data/styles/clear/style-night/symbols/baseball-m.svg index 66b1dd0b76..8cdb9b14a1 100644 --- a/data/styles/clear/style-night/symbols/baseball-m.svg +++ b/data/styles/clear/style-night/symbols/baseball-m.svg @@ -1,14 +1,7 @@ - - - - baseball-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/baseball-s.svg b/data/styles/clear/style-night/symbols/baseball-s.svg index ebee88f61c..50b811b36d 100644 --- a/data/styles/clear/style-night/symbols/baseball-s.svg +++ b/data/styles/clear/style-night/symbols/baseball-s.svg @@ -1,14 +1,7 @@ - - - - baseball-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/basketball-l.svg b/data/styles/clear/style-night/symbols/basketball-l.svg index dcc88bddc3..859ea126b2 100644 --- a/data/styles/clear/style-night/symbols/basketball-l.svg +++ b/data/styles/clear/style-night/symbols/basketball-l.svg @@ -1,14 +1,7 @@ - - - - basketball-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/basketball-m.svg b/data/styles/clear/style-night/symbols/basketball-m.svg index c1b1c684a2..6d82557539 100644 --- a/data/styles/clear/style-night/symbols/basketball-m.svg +++ b/data/styles/clear/style-night/symbols/basketball-m.svg @@ -1,14 +1,7 @@ - - - - basketball-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/basketball-s.svg b/data/styles/clear/style-night/symbols/basketball-s.svg index 8eea46bb8d..968e8bb64d 100644 --- a/data/styles/clear/style-night/symbols/basketball-s.svg +++ b/data/styles/clear/style-night/symbols/basketball-s.svg @@ -1,14 +1,7 @@ - - - - basketball-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bbq-l.svg b/data/styles/clear/style-night/symbols/bbq-l.svg index f661a69a9e..7a356f3d65 100644 --- a/data/styles/clear/style-night/symbols/bbq-l.svg +++ b/data/styles/clear/style-night/symbols/bbq-l.svg @@ -1,14 +1,7 @@ - - - - bbq-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bbq-m.svg b/data/styles/clear/style-night/symbols/bbq-m.svg index 0666525af5..915b47405b 100644 --- a/data/styles/clear/style-night/symbols/bbq-m.svg +++ b/data/styles/clear/style-night/symbols/bbq-m.svg @@ -1,14 +1,7 @@ - - - - bbq-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bbq-s.svg b/data/styles/clear/style-night/symbols/bbq-s.svg new file mode 100644 index 0000000000..dca826bada --- /dev/null +++ b/data/styles/clear/style-night/symbols/bbq-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bcontrol-l.svg b/data/styles/clear/style-night/symbols/bcontrol-l.svg index 43e25734b4..5ce7ba9b0a 100644 --- a/data/styles/clear/style-night/symbols/bcontrol-l.svg +++ b/data/styles/clear/style-night/symbols/bcontrol-l.svg @@ -1,15 +1,7 @@ - - - - bcontrol-l - Created with Sketch. - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bcontrol-m.svg b/data/styles/clear/style-night/symbols/bcontrol-m.svg index 116b3f382a..bed6d70b6d 100644 --- a/data/styles/clear/style-night/symbols/bcontrol-m.svg +++ b/data/styles/clear/style-night/symbols/bcontrol-m.svg @@ -1,14 +1,7 @@ - - - - bcontrol-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bcontrol-s.svg b/data/styles/clear/style-night/symbols/bcontrol-s.svg index 62a1145598..a30e647ae5 100644 --- a/data/styles/clear/style-night/symbols/bcontrol-s.svg +++ b/data/styles/clear/style-night/symbols/bcontrol-s.svg @@ -1,14 +1,7 @@ - - - - bcontrol-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/beach-l.svg b/data/styles/clear/style-night/symbols/beach-l.svg index 295cf97805..9ce7d12a0b 100644 --- a/data/styles/clear/style-night/symbols/beach-l.svg +++ b/data/styles/clear/style-night/symbols/beach-l.svg @@ -1,14 +1,7 @@ - - - - beach-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/beach-m.svg b/data/styles/clear/style-night/symbols/beach-m.svg index 29a67e0030..b4f7fce8dd 100644 --- a/data/styles/clear/style-night/symbols/beach-m.svg +++ b/data/styles/clear/style-night/symbols/beach-m.svg @@ -1,14 +1,7 @@ - - - - beach-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/beach-s.svg b/data/styles/clear/style-night/symbols/beach-s.svg index b634ecd772..cd85b3083b 100644 --- a/data/styles/clear/style-night/symbols/beach-s.svg +++ b/data/styles/clear/style-night/symbols/beach-s.svg @@ -1,14 +1,7 @@ - - - - beach-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/beauty-l.svg b/data/styles/clear/style-night/symbols/beauty-l.svg index 5cc6a38aeb..7ed447f93a 100644 --- a/data/styles/clear/style-night/symbols/beauty-l.svg +++ b/data/styles/clear/style-night/symbols/beauty-l.svg @@ -1,20 +1,7 @@ - - - - beauty-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/beauty-m.svg b/data/styles/clear/style-night/symbols/beauty-m.svg index 6bca1ed219..98cfe6da43 100644 --- a/data/styles/clear/style-night/symbols/beauty-m.svg +++ b/data/styles/clear/style-night/symbols/beauty-m.svg @@ -1,20 +1,7 @@ - - - - beauty-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/beauty-s.svg b/data/styles/clear/style-night/symbols/beauty-s.svg new file mode 100644 index 0000000000..3027a770d7 --- /dev/null +++ b/data/styles/clear/style-night/symbols/beauty-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/beer-l.svg b/data/styles/clear/style-night/symbols/beer-l.svg index d1ea6f682e..e1d9959e6f 100644 --- a/data/styles/clear/style-night/symbols/beer-l.svg +++ b/data/styles/clear/style-night/symbols/beer-l.svg @@ -1,20 +1,7 @@ - - - - beer-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/beer-m.svg b/data/styles/clear/style-night/symbols/beer-m.svg index 905b6f2e91..696f82d11e 100644 --- a/data/styles/clear/style-night/symbols/beer-m.svg +++ b/data/styles/clear/style-night/symbols/beer-m.svg @@ -1,20 +1,7 @@ - - - - beer-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/beer-s.svg b/data/styles/clear/style-night/symbols/beer-s.svg index 181f0a157e..1eee31d45c 100644 --- a/data/styles/clear/style-night/symbols/beer-s.svg +++ b/data/styles/clear/style-night/symbols/beer-s.svg @@ -1,16 +1,7 @@ - - - - beer-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bench.svg b/data/styles/clear/style-night/symbols/bench.svg index 38f3a8389d..1d260cc834 100644 --- a/data/styles/clear/style-night/symbols/bench.svg +++ b/data/styles/clear/style-night/symbols/bench.svg @@ -1,12 +1,3 @@ - - - - bench - Created with Sketch. - - - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-night/symbols/bicycle-l.svg b/data/styles/clear/style-night/symbols/bicycle-l.svg index d76936c582..6db40ebcfb 100644 --- a/data/styles/clear/style-night/symbols/bicycle-l.svg +++ b/data/styles/clear/style-night/symbols/bicycle-l.svg @@ -1,14 +1,7 @@ - - - - bicycle-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bicycle-m.svg b/data/styles/clear/style-night/symbols/bicycle-m.svg index b5a8f50765..427c3ccb5f 100644 --- a/data/styles/clear/style-night/symbols/bicycle-m.svg +++ b/data/styles/clear/style-night/symbols/bicycle-m.svg @@ -1,16 +1,7 @@ - - - - bicycle-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bicycle-s.svg b/data/styles/clear/style-night/symbols/bicycle-s.svg index be92bf97d3..d1df84fb76 100644 --- a/data/styles/clear/style-night/symbols/bicycle-s.svg +++ b/data/styles/clear/style-night/symbols/bicycle-s.svg @@ -1,14 +1,7 @@ - - - - bicycle-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bike-parking-l.svg b/data/styles/clear/style-night/symbols/bike-parking-l.svg index cc46baddde..637ae6b475 100644 --- a/data/styles/clear/style-night/symbols/bike-parking-l.svg +++ b/data/styles/clear/style-night/symbols/bike-parking-l.svg @@ -1,22 +1,7 @@ - - - - bike-parking-l - Created with Sketch. - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bike-parking-m.svg b/data/styles/clear/style-night/symbols/bike-parking-m.svg new file mode 100644 index 0000000000..b1aa996628 --- /dev/null +++ b/data/styles/clear/style-night/symbols/bike-parking-m.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bike-parking-s.svg b/data/styles/clear/style-night/symbols/bike-parking-s.svg new file mode 100644 index 0000000000..a772fb5dde --- /dev/null +++ b/data/styles/clear/style-night/symbols/bike-parking-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/book-shop-l.svg b/data/styles/clear/style-night/symbols/book-shop-l.svg index fc0fe10337..8931976718 100644 --- a/data/styles/clear/style-night/symbols/book-shop-l.svg +++ b/data/styles/clear/style-night/symbols/book-shop-l.svg @@ -1,20 +1,7 @@ - - - - book-shop-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/book-shop-m.svg b/data/styles/clear/style-night/symbols/book-shop-m.svg index 878e24d85c..44c26135d8 100644 --- a/data/styles/clear/style-night/symbols/book-shop-m.svg +++ b/data/styles/clear/style-night/symbols/book-shop-m.svg @@ -1,20 +1,7 @@ - - - - book-shop-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/book-shop-s.svg b/data/styles/clear/style-night/symbols/book-shop-s.svg index 7e96ec5ef9..9dbc84dc99 100644 --- a/data/styles/clear/style-night/symbols/book-shop-s.svg +++ b/data/styles/clear/style-night/symbols/book-shop-s.svg @@ -1,20 +1,7 @@ - - - - book-shop-s - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bookmaker-l.svg b/data/styles/clear/style-night/symbols/bookmaker-l.svg index b91c8f1509..c7a4881af6 100644 --- a/data/styles/clear/style-night/symbols/bookmaker-l.svg +++ b/data/styles/clear/style-night/symbols/bookmaker-l.svg @@ -1,28 +1,7 @@ - - - - bookmaker-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bookmaker-m.svg b/data/styles/clear/style-night/symbols/bookmaker-m.svg index 0420e26f0c..d549d7e805 100644 --- a/data/styles/clear/style-night/symbols/bookmaker-m.svg +++ b/data/styles/clear/style-night/symbols/bookmaker-m.svg @@ -1,16 +1,7 @@ - - - - bookmaker-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bookmaker-s.svg b/data/styles/clear/style-night/symbols/bookmaker-s.svg new file mode 100644 index 0000000000..41735532b9 --- /dev/null +++ b/data/styles/clear/style-night/symbols/bookmaker-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bowls-l.svg b/data/styles/clear/style-night/symbols/bowls-l.svg index 5fb6b5e181..4de38aa614 100644 --- a/data/styles/clear/style-night/symbols/bowls-l.svg +++ b/data/styles/clear/style-night/symbols/bowls-l.svg @@ -1,14 +1,7 @@ - - - - bowls-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bowls-m.svg b/data/styles/clear/style-night/symbols/bowls-m.svg index 578711f872..bb16da14c4 100644 --- a/data/styles/clear/style-night/symbols/bowls-m.svg +++ b/data/styles/clear/style-night/symbols/bowls-m.svg @@ -1,14 +1,7 @@ - - - - bowls-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bowls-s.svg b/data/styles/clear/style-night/symbols/bowls-s.svg index 7bbea7b753..6afc3959a7 100644 --- a/data/styles/clear/style-night/symbols/bowls-s.svg +++ b/data/styles/clear/style-night/symbols/bowls-s.svg @@ -1,14 +1,7 @@ - - - - bowls-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/buddhist-l.svg b/data/styles/clear/style-night/symbols/buddhist-l.svg index bb41502a47..8f7351984a 100644 --- a/data/styles/clear/style-night/symbols/buddhist-l.svg +++ b/data/styles/clear/style-night/symbols/buddhist-l.svg @@ -1,16 +1,7 @@ - - - - buddhist-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/buddhist-m.svg b/data/styles/clear/style-night/symbols/buddhist-m.svg index d14aa92db0..7aa083a1a0 100644 --- a/data/styles/clear/style-night/symbols/buddhist-m.svg +++ b/data/styles/clear/style-night/symbols/buddhist-m.svg @@ -1,16 +1,7 @@ - - - - buddhist-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/buddhist-s.svg b/data/styles/clear/style-night/symbols/buddhist-s.svg index 3d4acc9018..db85e82fae 100644 --- a/data/styles/clear/style-night/symbols/buddhist-s.svg +++ b/data/styles/clear/style-night/symbols/buddhist-s.svg @@ -1,16 +1,7 @@ - - - - buddhist-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bus-l.svg b/data/styles/clear/style-night/symbols/bus-l.svg index 5279ef8c52..6ac58a61ee 100644 --- a/data/styles/clear/style-night/symbols/bus-l.svg +++ b/data/styles/clear/style-night/symbols/bus-l.svg @@ -1,18 +1,7 @@ - - - - bus-l - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bus-m.svg b/data/styles/clear/style-night/symbols/bus-m.svg index bbd3b6822e..daece33b97 100644 --- a/data/styles/clear/style-night/symbols/bus-m.svg +++ b/data/styles/clear/style-night/symbols/bus-m.svg @@ -1,18 +1,7 @@ - - - - bus-m - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/bus-s.svg b/data/styles/clear/style-night/symbols/bus-s.svg index c3c43c7f46..3b22e68ed1 100644 --- a/data/styles/clear/style-night/symbols/bus-s.svg +++ b/data/styles/clear/style-night/symbols/bus-s.svg @@ -1,18 +1,7 @@ - - - - bus-s - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/butcher-l.svg b/data/styles/clear/style-night/symbols/butcher-l.svg index 5c3625f36b..eb140f4af1 100644 --- a/data/styles/clear/style-night/symbols/butcher-l.svg +++ b/data/styles/clear/style-night/symbols/butcher-l.svg @@ -1,20 +1,7 @@ - - - - butcher-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/butcher-m.svg b/data/styles/clear/style-night/symbols/butcher-m.svg index e4d00e95ee..ce7fe3568c 100644 --- a/data/styles/clear/style-night/symbols/butcher-m.svg +++ b/data/styles/clear/style-night/symbols/butcher-m.svg @@ -1,20 +1,7 @@ - - - - butcher-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/butcher-s.svg b/data/styles/clear/style-night/symbols/butcher-s.svg new file mode 100644 index 0000000000..06009556f1 --- /dev/null +++ b/data/styles/clear/style-night/symbols/butcher-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/cable-car-l.svg b/data/styles/clear/style-night/symbols/cable-car-l.svg index 80cb4d86dd..e4666cff39 100644 --- a/data/styles/clear/style-night/symbols/cable-car-l.svg +++ b/data/styles/clear/style-night/symbols/cable-car-l.svg @@ -1,19 +1,7 @@ - - - - cable-car-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/cable-car-m.svg b/data/styles/clear/style-night/symbols/cable-car-m.svg index d4f3536fbf..4ca93e1926 100644 --- a/data/styles/clear/style-night/symbols/cable-car-m.svg +++ b/data/styles/clear/style-night/symbols/cable-car-m.svg @@ -1,21 +1,7 @@ - - - - cable-car-m - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/cable-car-s.svg b/data/styles/clear/style-night/symbols/cable-car-s.svg index 418c9d6af4..c9765387ec 100644 --- a/data/styles/clear/style-night/symbols/cable-car-s.svg +++ b/data/styles/clear/style-night/symbols/cable-car-s.svg @@ -1,20 +1,7 @@ - - - - cable-car-s - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/cafe-l.svg b/data/styles/clear/style-night/symbols/cafe-l.svg index c32171863f..3f23dd9a0a 100644 --- a/data/styles/clear/style-night/symbols/cafe-l.svg +++ b/data/styles/clear/style-night/symbols/cafe-l.svg @@ -1,16 +1,7 @@ - - - - cafe-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/cafe-m.svg b/data/styles/clear/style-night/symbols/cafe-m.svg index 4fa18270cf..aa70765812 100644 --- a/data/styles/clear/style-night/symbols/cafe-m.svg +++ b/data/styles/clear/style-night/symbols/cafe-m.svg @@ -1,16 +1,7 @@ - - - - cafe-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/cafe-s.svg b/data/styles/clear/style-night/symbols/cafe-s.svg index 719300b9d2..e23c86a633 100644 --- a/data/styles/clear/style-night/symbols/cafe-s.svg +++ b/data/styles/clear/style-night/symbols/cafe-s.svg @@ -1,16 +1,7 @@ - - - - cafe-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/campsite-l.svg b/data/styles/clear/style-night/symbols/campsite-l.svg index 76590995a3..ccf54c0230 100644 --- a/data/styles/clear/style-night/symbols/campsite-l.svg +++ b/data/styles/clear/style-night/symbols/campsite-l.svg @@ -1,14 +1,7 @@ - - - - campsite-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/campsite-m.svg b/data/styles/clear/style-night/symbols/campsite-m.svg index ecb7fea310..b7a437600d 100644 --- a/data/styles/clear/style-night/symbols/campsite-m.svg +++ b/data/styles/clear/style-night/symbols/campsite-m.svg @@ -1,14 +1,7 @@ - - - - campsite-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/campsite-s.svg b/data/styles/clear/style-night/symbols/campsite-s.svg index 4c8a827a63..79a60d6dc2 100644 --- a/data/styles/clear/style-night/symbols/campsite-s.svg +++ b/data/styles/clear/style-night/symbols/campsite-s.svg @@ -1,14 +1,7 @@ - - - - campsite-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/car-part-l.svg b/data/styles/clear/style-night/symbols/car-part-l.svg index e3de1374a3..f431ca3b4c 100644 --- a/data/styles/clear/style-night/symbols/car-part-l.svg +++ b/data/styles/clear/style-night/symbols/car-part-l.svg @@ -1,31 +1,7 @@ - - - - car-part-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/car-part-m.svg b/data/styles/clear/style-night/symbols/car-part-m.svg index 594de1428b..22cf5f0f54 100644 --- a/data/styles/clear/style-night/symbols/car-part-m.svg +++ b/data/styles/clear/style-night/symbols/car-part-m.svg @@ -1,16 +1,7 @@ - - - - car-part-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/car-part-s.svg b/data/styles/clear/style-night/symbols/car-part-s.svg index 9bc040c720..9de8c5d683 100644 --- a/data/styles/clear/style-night/symbols/car-part-s.svg +++ b/data/styles/clear/style-night/symbols/car-part-s.svg @@ -1,16 +1,7 @@ - - - - car-part-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/car-repair-l.svg b/data/styles/clear/style-night/symbols/car-repair-l.svg index 0691d75317..2280225f4e 100644 --- a/data/styles/clear/style-night/symbols/car-repair-l.svg +++ b/data/styles/clear/style-night/symbols/car-repair-l.svg @@ -1,20 +1,7 @@ - - - - car-repair-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/car-repair-m.svg b/data/styles/clear/style-night/symbols/car-repair-m.svg index 33ac6b94b2..d24b8d0b5f 100644 --- a/data/styles/clear/style-night/symbols/car-repair-m.svg +++ b/data/styles/clear/style-night/symbols/car-repair-m.svg @@ -1,20 +1,7 @@ - - - - car-repair-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/car-repair-s.svg b/data/styles/clear/style-night/symbols/car-repair-s.svg index 53b6e04293..36815ac1e3 100644 --- a/data/styles/clear/style-night/symbols/car-repair-s.svg +++ b/data/styles/clear/style-night/symbols/car-repair-s.svg @@ -1,16 +1,7 @@ - - - - car-repair-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/car-wash-l.svg b/data/styles/clear/style-night/symbols/car-wash-l.svg index ea0f8c0d30..5553ba888d 100644 --- a/data/styles/clear/style-night/symbols/car-wash-l.svg +++ b/data/styles/clear/style-night/symbols/car-wash-l.svg @@ -1,33 +1,7 @@ - - - - car-wash-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/car-wash-m.svg b/data/styles/clear/style-night/symbols/car-wash-m.svg index e23c2d6286..b5a3ab9900 100644 --- a/data/styles/clear/style-night/symbols/car-wash-m.svg +++ b/data/styles/clear/style-night/symbols/car-wash-m.svg @@ -1,19 +1,7 @@ - - - - car-wash-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/car-wash-s.svg b/data/styles/clear/style-night/symbols/car-wash-s.svg index 4a668286d3..3a2ed40842 100644 --- a/data/styles/clear/style-night/symbols/car-wash-s.svg +++ b/data/styles/clear/style-night/symbols/car-wash-s.svg @@ -1,19 +1,7 @@ - - - - car-wash-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/car_sharing-l.svg b/data/styles/clear/style-night/symbols/car_sharing-l.svg index eb79c82569..11b11d02ef 100644 --- a/data/styles/clear/style-night/symbols/car_sharing-l.svg +++ b/data/styles/clear/style-night/symbols/car_sharing-l.svg @@ -1,31 +1,7 @@ - - - - car_sharing-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/car_sharing-m.svg b/data/styles/clear/style-night/symbols/car_sharing-m.svg index c187b314e2..5a355defc4 100644 --- a/data/styles/clear/style-night/symbols/car_sharing-m.svg +++ b/data/styles/clear/style-night/symbols/car_sharing-m.svg @@ -1,17 +1,7 @@ - - - - car_sharing-m - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/car_sharing-s.svg b/data/styles/clear/style-night/symbols/car_sharing-s.svg index 834f0968a0..31ad832b46 100644 --- a/data/styles/clear/style-night/symbols/car_sharing-s.svg +++ b/data/styles/clear/style-night/symbols/car_sharing-s.svg @@ -1,16 +1,7 @@ - - - - car_sharing-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/car_shop-l.svg b/data/styles/clear/style-night/symbols/car_shop-l.svg index 1a81c3c045..645e09f8db 100644 --- a/data/styles/clear/style-night/symbols/car_shop-l.svg +++ b/data/styles/clear/style-night/symbols/car_shop-l.svg @@ -1,20 +1,7 @@ - - - - car_shop-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/car_shop-m.svg b/data/styles/clear/style-night/symbols/car_shop-m.svg index a6bef8d56c..e9b62c7e03 100644 --- a/data/styles/clear/style-night/symbols/car_shop-m.svg +++ b/data/styles/clear/style-night/symbols/car_shop-m.svg @@ -1,20 +1,7 @@ - - - - car_shop-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/car_shop-s.svg b/data/styles/clear/style-night/symbols/car_shop-s.svg index c59081319d..95317fe20f 100644 --- a/data/styles/clear/style-night/symbols/car_shop-s.svg +++ b/data/styles/clear/style-night/symbols/car_shop-s.svg @@ -1,20 +1,7 @@ - - - - car_shop-s - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/caravan_site-l.svg b/data/styles/clear/style-night/symbols/caravan_site-l.svg index 1f8ebe0037..4059854302 100644 --- a/data/styles/clear/style-night/symbols/caravan_site-l.svg +++ b/data/styles/clear/style-night/symbols/caravan_site-l.svg @@ -1,14 +1,7 @@ - - - - caravan_site-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/caravan_site-m.svg b/data/styles/clear/style-night/symbols/caravan_site-m.svg index f94df70f9c..b86389421c 100644 --- a/data/styles/clear/style-night/symbols/caravan_site-m.svg +++ b/data/styles/clear/style-night/symbols/caravan_site-m.svg @@ -1,14 +1,7 @@ - - - - caravan_site-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/caravan_site-s.svg b/data/styles/clear/style-night/symbols/caravan_site-s.svg new file mode 100644 index 0000000000..7c1b981739 --- /dev/null +++ b/data/styles/clear/style-night/symbols/caravan_site-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/casino-l.svg b/data/styles/clear/style-night/symbols/casino-l.svg index 2ee41b31a8..e984d27f06 100644 --- a/data/styles/clear/style-night/symbols/casino-l.svg +++ b/data/styles/clear/style-night/symbols/casino-l.svg @@ -1,16 +1,7 @@ - - - - casino-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/casino-m.svg b/data/styles/clear/style-night/symbols/casino-m.svg index 8ca2d1d9d3..5c71a01ba7 100644 --- a/data/styles/clear/style-night/symbols/casino-m.svg +++ b/data/styles/clear/style-night/symbols/casino-m.svg @@ -1,16 +1,7 @@ - - - - casino-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/casino-s.svg b/data/styles/clear/style-night/symbols/casino-s.svg index ed9fda0dd0..4728357268 100644 --- a/data/styles/clear/style-night/symbols/casino-s.svg +++ b/data/styles/clear/style-night/symbols/casino-s.svg @@ -1,16 +1,7 @@ - - - - casino-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/cave-l.svg b/data/styles/clear/style-night/symbols/cave-l.svg index 7f77b3ce70..838c719b53 100644 --- a/data/styles/clear/style-night/symbols/cave-l.svg +++ b/data/styles/clear/style-night/symbols/cave-l.svg @@ -1,13 +1,5 @@ - - - - cave-l - Created with Sketch. - - - - - - - - \ No newline at end of file + + + + + diff --git a/data/styles/clear/style-night/symbols/cave-m.svg b/data/styles/clear/style-night/symbols/cave-m.svg index 12f241140a..4d8466fb46 100644 --- a/data/styles/clear/style-night/symbols/cave-m.svg +++ b/data/styles/clear/style-night/symbols/cave-m.svg @@ -1,12 +1,3 @@ - - - - cave-m - Created with Sketch. - - - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-night/symbols/cave-s.svg b/data/styles/clear/style-night/symbols/cave-s.svg index 7fb898fc26..e675c5bc6d 100644 --- a/data/styles/clear/style-night/symbols/cave-s.svg +++ b/data/styles/clear/style-night/symbols/cave-s.svg @@ -1,12 +1,3 @@ - - - - cave-s - Created with Sketch. - - - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-night/symbols/cemetery-l.svg b/data/styles/clear/style-night/symbols/cemetery-l.svg index bb1833b1cc..0e9a6f7f0d 100644 --- a/data/styles/clear/style-night/symbols/cemetery-l.svg +++ b/data/styles/clear/style-night/symbols/cemetery-l.svg @@ -1,14 +1,7 @@ - - - - cemetery-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/cemetery-m.svg b/data/styles/clear/style-night/symbols/cemetery-m.svg index fcbed6a72f..70bfc78f86 100644 --- a/data/styles/clear/style-night/symbols/cemetery-m.svg +++ b/data/styles/clear/style-night/symbols/cemetery-m.svg @@ -1,14 +1,7 @@ - - - - cemetery-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/cemetery-s.svg b/data/styles/clear/style-night/symbols/cemetery-s.svg index 33c8c7a761..01a2144784 100644 --- a/data/styles/clear/style-night/symbols/cemetery-s.svg +++ b/data/styles/clear/style-night/symbols/cemetery-s.svg @@ -1,14 +1,7 @@ - - - - cemetery-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/charging-station-l.svg b/data/styles/clear/style-night/symbols/charging-station-l.svg index 89b8b604a8..1a1ecf7eb5 100644 --- a/data/styles/clear/style-night/symbols/charging-station-l.svg +++ b/data/styles/clear/style-night/symbols/charging-station-l.svg @@ -1,22 +1,7 @@ - - - - charging-station-l - Created with Sketch. - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/charging-station-m.svg b/data/styles/clear/style-night/symbols/charging-station-m.svg index 145c6f3422..fa0cd58236 100644 --- a/data/styles/clear/style-night/symbols/charging-station-m.svg +++ b/data/styles/clear/style-night/symbols/charging-station-m.svg @@ -1,16 +1,7 @@ - - - - charging-station-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/charging-station-s.svg b/data/styles/clear/style-night/symbols/charging-station-s.svg index 2aa45dde7d..03d911be88 100644 --- a/data/styles/clear/style-night/symbols/charging-station-s.svg +++ b/data/styles/clear/style-night/symbols/charging-station-s.svg @@ -1,16 +1,7 @@ - - - - charging-station-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/chemist-l.svg b/data/styles/clear/style-night/symbols/chemist-l.svg index 4c723a31ce..3e79d01e33 100644 --- a/data/styles/clear/style-night/symbols/chemist-l.svg +++ b/data/styles/clear/style-night/symbols/chemist-l.svg @@ -1,20 +1,7 @@ - - - - chemist-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/chemist-m.svg b/data/styles/clear/style-night/symbols/chemist-m.svg index b6fd08663e..3d1b9ea5b7 100644 --- a/data/styles/clear/style-night/symbols/chemist-m.svg +++ b/data/styles/clear/style-night/symbols/chemist-m.svg @@ -1,20 +1,7 @@ - - - - chemist-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/chemist-s.svg b/data/styles/clear/style-night/symbols/chemist-s.svg new file mode 100644 index 0000000000..81fa09710a --- /dev/null +++ b/data/styles/clear/style-night/symbols/chemist-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/chimney-l.svg b/data/styles/clear/style-night/symbols/chimney-l.svg index b494df0e87..ddc260cb61 100644 --- a/data/styles/clear/style-night/symbols/chimney-l.svg +++ b/data/styles/clear/style-night/symbols/chimney-l.svg @@ -1,18 +1,6 @@ - - - - chimney-l - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/chimney-m.svg b/data/styles/clear/style-night/symbols/chimney-m.svg index 7057995ef9..9d1a16c3f8 100644 --- a/data/styles/clear/style-night/symbols/chimney-m.svg +++ b/data/styles/clear/style-night/symbols/chimney-m.svg @@ -1,18 +1,6 @@ - - - - chimney-m - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/chimney-s.svg b/data/styles/clear/style-night/symbols/chimney-s.svg new file mode 100644 index 0000000000..062e016f08 --- /dev/null +++ b/data/styles/clear/style-night/symbols/chimney-s.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/data/styles/clear/style-night/symbols/christian-l.svg b/data/styles/clear/style-night/symbols/christian-l.svg index 78e0b7662a..9bbc2562a5 100644 --- a/data/styles/clear/style-night/symbols/christian-l.svg +++ b/data/styles/clear/style-night/symbols/christian-l.svg @@ -1,16 +1,7 @@ - - - - christian-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/christian-m.svg b/data/styles/clear/style-night/symbols/christian-m.svg index 579aad0f98..49e7418724 100644 --- a/data/styles/clear/style-night/symbols/christian-m.svg +++ b/data/styles/clear/style-night/symbols/christian-m.svg @@ -1,17 +1,7 @@ - - - - christian-m - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/christian-s.svg b/data/styles/clear/style-night/symbols/christian-s.svg index 903cdcf353..f6e3585ef9 100644 --- a/data/styles/clear/style-night/symbols/christian-s.svg +++ b/data/styles/clear/style-night/symbols/christian-s.svg @@ -1,17 +1,7 @@ - - - - christian-s - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/cinema-l.svg b/data/styles/clear/style-night/symbols/cinema-l.svg index e783167da9..f9a580f521 100644 --- a/data/styles/clear/style-night/symbols/cinema-l.svg +++ b/data/styles/clear/style-night/symbols/cinema-l.svg @@ -1,16 +1,7 @@ - - - - cinema-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/cinema-m.svg b/data/styles/clear/style-night/symbols/cinema-m.svg index 387c88fbe0..5a5306df77 100644 --- a/data/styles/clear/style-night/symbols/cinema-m.svg +++ b/data/styles/clear/style-night/symbols/cinema-m.svg @@ -1,16 +1,7 @@ - - - - cinema-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/cinema-s.svg b/data/styles/clear/style-night/symbols/cinema-s.svg index 9ea389fdc0..1575415118 100644 --- a/data/styles/clear/style-night/symbols/cinema-s.svg +++ b/data/styles/clear/style-night/symbols/cinema-s.svg @@ -1,16 +1,7 @@ - - - - cinema-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/cities-m.svg b/data/styles/clear/style-night/symbols/cities-m.svg new file mode 100644 index 0000000000..04c1b2c82c --- /dev/null +++ b/data/styles/clear/style-night/symbols/cities-m.svg @@ -0,0 +1,3 @@ + + + diff --git a/data/styles/clear/style-night/symbols/cities-s.svg b/data/styles/clear/style-night/symbols/cities-s.svg new file mode 100644 index 0000000000..a749dc530b --- /dev/null +++ b/data/styles/clear/style-night/symbols/cities-s.svg @@ -0,0 +1,3 @@ + + + diff --git a/data/styles/clear/style-night/symbols/cities-xs.svg b/data/styles/clear/style-night/symbols/cities-xs.svg new file mode 100644 index 0000000000..39b65a8626 --- /dev/null +++ b/data/styles/clear/style-night/symbols/cities-xs.svg @@ -0,0 +1,3 @@ + + + diff --git a/data/styles/clear/style-night/symbols/climbing-l.svg b/data/styles/clear/style-night/symbols/climbing-l.svg index d7e16cbeeb..0bb133fe9c 100644 --- a/data/styles/clear/style-night/symbols/climbing-l.svg +++ b/data/styles/clear/style-night/symbols/climbing-l.svg @@ -1,20 +1,7 @@ - - - - climbing-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/climbing-m.svg b/data/styles/clear/style-night/symbols/climbing-m.svg index 766112d442..596e129d82 100644 --- a/data/styles/clear/style-night/symbols/climbing-m.svg +++ b/data/styles/clear/style-night/symbols/climbing-m.svg @@ -1,15 +1,7 @@ - - - - climbing-l.svg - Created with Sketch. - - - - - - - - - + + + + + + diff --git a/data/styles/clear/style-night/symbols/climbing-s.svg b/data/styles/clear/style-night/symbols/climbing-s.svg index cad5484982..e1d1876a49 100644 --- a/data/styles/clear/style-night/symbols/climbing-s.svg +++ b/data/styles/clear/style-night/symbols/climbing-s.svg @@ -1,15 +1,7 @@ - - - - climbing-l.svg - Created with Sketch. - - - - - - - - - + + + + + + diff --git a/data/styles/clear/style-night/symbols/clothes-l.svg b/data/styles/clear/style-night/symbols/clothes-l.svg index 878d1634e5..ce6d9962f5 100644 --- a/data/styles/clear/style-night/symbols/clothes-l.svg +++ b/data/styles/clear/style-night/symbols/clothes-l.svg @@ -1,20 +1,7 @@ - - - - clothes-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/clothes-m.svg b/data/styles/clear/style-night/symbols/clothes-m.svg index b7e08b7044..467b3efda3 100644 --- a/data/styles/clear/style-night/symbols/clothes-m.svg +++ b/data/styles/clear/style-night/symbols/clothes-m.svg @@ -1,20 +1,7 @@ - - - - clothes-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/clothes-s.svg b/data/styles/clear/style-night/symbols/clothes-s.svg new file mode 100644 index 0000000000..870278e18e --- /dev/null +++ b/data/styles/clear/style-night/symbols/clothes-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/college-l.svg b/data/styles/clear/style-night/symbols/college-l.svg index b500c0811c..368798a346 100644 --- a/data/styles/clear/style-night/symbols/college-l.svg +++ b/data/styles/clear/style-night/symbols/college-l.svg @@ -1,14 +1,7 @@ - - - - college-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/college-m.svg b/data/styles/clear/style-night/symbols/college-m.svg index 0ad2b51a61..468ff8d201 100644 --- a/data/styles/clear/style-night/symbols/college-m.svg +++ b/data/styles/clear/style-night/symbols/college-m.svg @@ -1,14 +1,7 @@ - - - - college-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/college-s.svg b/data/styles/clear/style-night/symbols/college-s.svg index 4cdf984f10..aef6f87569 100644 --- a/data/styles/clear/style-night/symbols/college-s.svg +++ b/data/styles/clear/style-night/symbols/college-s.svg @@ -1,14 +1,7 @@ - - - - college-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/computer-l.svg b/data/styles/clear/style-night/symbols/computer-l.svg index 59a10d503a..6347d90dc1 100644 --- a/data/styles/clear/style-night/symbols/computer-l.svg +++ b/data/styles/clear/style-night/symbols/computer-l.svg @@ -1,20 +1,7 @@ - - - - computer-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/computer-m.svg b/data/styles/clear/style-night/symbols/computer-m.svg index 374b359b33..f1044b4f47 100644 --- a/data/styles/clear/style-night/symbols/computer-m.svg +++ b/data/styles/clear/style-night/symbols/computer-m.svg @@ -1,20 +1,7 @@ - - - - computer-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/computer-s.svg b/data/styles/clear/style-night/symbols/computer-s.svg new file mode 100644 index 0000000000..115d1c9c9d --- /dev/null +++ b/data/styles/clear/style-night/symbols/computer-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/convenience-l.svg b/data/styles/clear/style-night/symbols/convenience-l.svg index 94c981db46..f14c3b9fa4 100644 --- a/data/styles/clear/style-night/symbols/convenience-l.svg +++ b/data/styles/clear/style-night/symbols/convenience-l.svg @@ -1,20 +1,7 @@ - - - - convenience-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/convenience-m.svg b/data/styles/clear/style-night/symbols/convenience-m.svg index 08081eb2e6..8396986aa4 100644 --- a/data/styles/clear/style-night/symbols/convenience-m.svg +++ b/data/styles/clear/style-night/symbols/convenience-m.svg @@ -1,20 +1,7 @@ - - - - convenience-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/convenience-s.svg b/data/styles/clear/style-night/symbols/convenience-s.svg new file mode 100644 index 0000000000..76828ec718 --- /dev/null +++ b/data/styles/clear/style-night/symbols/convenience-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/copyshop-l.svg b/data/styles/clear/style-night/symbols/copyshop-l.svg index e287b473e5..cb1f51e5a7 100644 --- a/data/styles/clear/style-night/symbols/copyshop-l.svg +++ b/data/styles/clear/style-night/symbols/copyshop-l.svg @@ -1,26 +1,7 @@ - - - - copyshop-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/copyshop-m.svg b/data/styles/clear/style-night/symbols/copyshop-m.svg index 29f4b9c72f..48a3f4cd1f 100644 --- a/data/styles/clear/style-night/symbols/copyshop-m.svg +++ b/data/styles/clear/style-night/symbols/copyshop-m.svg @@ -1,26 +1,7 @@ - - - - copyshop-m - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/copyshop-s.svg b/data/styles/clear/style-night/symbols/copyshop-s.svg new file mode 100644 index 0000000000..a58aae1bc9 --- /dev/null +++ b/data/styles/clear/style-night/symbols/copyshop-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/cricket-l.svg b/data/styles/clear/style-night/symbols/cricket-l.svg index efb6aa6003..442165803e 100644 --- a/data/styles/clear/style-night/symbols/cricket-l.svg +++ b/data/styles/clear/style-night/symbols/cricket-l.svg @@ -1,14 +1,7 @@ - - - - cricket-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/cricket-m.svg b/data/styles/clear/style-night/symbols/cricket-m.svg index 59bde165bf..01ec60ece8 100644 --- a/data/styles/clear/style-night/symbols/cricket-m.svg +++ b/data/styles/clear/style-night/symbols/cricket-m.svg @@ -1,14 +1,7 @@ - - - - cricket-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/cricket-s.svg b/data/styles/clear/style-night/symbols/cricket-s.svg index 9a344e38eb..4a8ff2b243 100644 --- a/data/styles/clear/style-night/symbols/cricket-s.svg +++ b/data/styles/clear/style-night/symbols/cricket-s.svg @@ -1,14 +1,7 @@ - - - - cricket-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/crossing-l.svg b/data/styles/clear/style-night/symbols/crossing-l.svg new file mode 100644 index 0000000000..5bdd91fc0a --- /dev/null +++ b/data/styles/clear/style-night/symbols/crossing-l.svg @@ -0,0 +1,3 @@ + + + diff --git a/data/styles/clear/style-night/symbols/crossing-m.svg b/data/styles/clear/style-night/symbols/crossing-m.svg new file mode 100644 index 0000000000..fa38625353 --- /dev/null +++ b/data/styles/clear/style-night/symbols/crossing-m.svg @@ -0,0 +1,3 @@ + + + diff --git a/data/styles/clear/style-night/symbols/crossing-s.svg b/data/styles/clear/style-night/symbols/crossing-s.svg new file mode 100644 index 0000000000..10c151f0ff --- /dev/null +++ b/data/styles/clear/style-night/symbols/crossing-s.svg @@ -0,0 +1,3 @@ + + + diff --git a/data/styles/clear/style-night/symbols/curling-l.svg b/data/styles/clear/style-night/symbols/curling-l.svg index df5dcbe949..1005b30b27 100644 --- a/data/styles/clear/style-night/symbols/curling-l.svg +++ b/data/styles/clear/style-night/symbols/curling-l.svg @@ -1,14 +1,7 @@ - - - - curling-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/curling-m.svg b/data/styles/clear/style-night/symbols/curling-m.svg index 983278aa4e..39e57f782b 100644 --- a/data/styles/clear/style-night/symbols/curling-m.svg +++ b/data/styles/clear/style-night/symbols/curling-m.svg @@ -1,14 +1,7 @@ - - - - curling-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/curling-s.svg b/data/styles/clear/style-night/symbols/curling-s.svg index ebd972b20f..93bd442fba 100644 --- a/data/styles/clear/style-night/symbols/curling-s.svg +++ b/data/styles/clear/style-night/symbols/curling-s.svg @@ -1,14 +1,7 @@ - - - - curling-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/dentist-l.svg b/data/styles/clear/style-night/symbols/dentist-l.svg index 1f4f89b812..bc68b6e85b 100644 --- a/data/styles/clear/style-night/symbols/dentist-l.svg +++ b/data/styles/clear/style-night/symbols/dentist-l.svg @@ -1,14 +1,7 @@ - - - - dentist-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/dentist-m.svg b/data/styles/clear/style-night/symbols/dentist-m.svg index 35373dac3a..b4acf2d4c8 100644 --- a/data/styles/clear/style-night/symbols/dentist-m.svg +++ b/data/styles/clear/style-night/symbols/dentist-m.svg @@ -1,14 +1,7 @@ - - - - dentist-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/dentist-s.svg b/data/styles/clear/style-night/symbols/dentist-s.svg new file mode 100644 index 0000000000..1064a74072 --- /dev/null +++ b/data/styles/clear/style-night/symbols/dentist-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/department_store-l.svg b/data/styles/clear/style-night/symbols/department_store-l.svg index be67d19dd2..6d7fceed09 100644 --- a/data/styles/clear/style-night/symbols/department_store-l.svg +++ b/data/styles/clear/style-night/symbols/department_store-l.svg @@ -1,20 +1,7 @@ - - - - department_store-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/department_store-m.svg b/data/styles/clear/style-night/symbols/department_store-m.svg index 3240a82e85..0d27d6cf59 100644 --- a/data/styles/clear/style-night/symbols/department_store-m.svg +++ b/data/styles/clear/style-night/symbols/department_store-m.svg @@ -1,20 +1,7 @@ - - - - department_store-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/department_store-s.svg b/data/styles/clear/style-night/symbols/department_store-s.svg new file mode 100644 index 0000000000..7dae6e32b4 --- /dev/null +++ b/data/styles/clear/style-night/symbols/department_store-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/diving-l.svg b/data/styles/clear/style-night/symbols/diving-l.svg index 3a036b65ed..041207e3c1 100644 --- a/data/styles/clear/style-night/symbols/diving-l.svg +++ b/data/styles/clear/style-night/symbols/diving-l.svg @@ -1,14 +1,7 @@ - - - - diving-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/diving-m.svg b/data/styles/clear/style-night/symbols/diving-m.svg index a0e4a17e17..108ad3420d 100644 --- a/data/styles/clear/style-night/symbols/diving-m.svg +++ b/data/styles/clear/style-night/symbols/diving-m.svg @@ -1,14 +1,7 @@ - - - - diving-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/diving-s.svg b/data/styles/clear/style-night/symbols/diving-s.svg index ab9b8c51f4..6fc3f55bb4 100644 --- a/data/styles/clear/style-night/symbols/diving-s.svg +++ b/data/styles/clear/style-night/symbols/diving-s.svg @@ -1,14 +1,7 @@ - - - - diving-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/dog_park-l.svg b/data/styles/clear/style-night/symbols/dog_park-l.svg index 46aa7ad301..c633747310 100644 --- a/data/styles/clear/style-night/symbols/dog_park-l.svg +++ b/data/styles/clear/style-night/symbols/dog_park-l.svg @@ -1,14 +1,7 @@ - - - - dog_park-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/dog_park-m.svg b/data/styles/clear/style-night/symbols/dog_park-m.svg index 876b9f79aa..75857e3266 100644 --- a/data/styles/clear/style-night/symbols/dog_park-m.svg +++ b/data/styles/clear/style-night/symbols/dog_park-m.svg @@ -1,14 +1,7 @@ - - - - dog_park-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/dog_park-s.svg b/data/styles/clear/style-night/symbols/dog_park-s.svg new file mode 100644 index 0000000000..97e5eba60d --- /dev/null +++ b/data/styles/clear/style-night/symbols/dog_park-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/doityourself-l.svg b/data/styles/clear/style-night/symbols/doityourself-l.svg index a9aee185e7..edf4a0b236 100644 --- a/data/styles/clear/style-night/symbols/doityourself-l.svg +++ b/data/styles/clear/style-night/symbols/doityourself-l.svg @@ -1,20 +1,7 @@ - - - - doityourself-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/doityourself-m.svg b/data/styles/clear/style-night/symbols/doityourself-m.svg index 44dcb9c45f..673b2a5151 100644 --- a/data/styles/clear/style-night/symbols/doityourself-m.svg +++ b/data/styles/clear/style-night/symbols/doityourself-m.svg @@ -1,20 +1,7 @@ - - - - doityourself-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/doityourself-s.svg b/data/styles/clear/style-night/symbols/doityourself-s.svg new file mode 100644 index 0000000000..f7cdaee2cd --- /dev/null +++ b/data/styles/clear/style-night/symbols/doityourself-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/dot-m.svg b/data/styles/clear/style-night/symbols/dot-m.svg index f9b8d0838b..88c557a7b3 100644 --- a/data/styles/clear/style-night/symbols/dot-m.svg +++ b/data/styles/clear/style-night/symbols/dot-m.svg @@ -1,15 +1,6 @@ - - - - dot-m - Created with Sketch. - - - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/dot-s-light.svg b/data/styles/clear/style-night/symbols/dot-s-light.svg deleted file mode 100644 index a151a0ced5..0000000000 --- a/data/styles/clear/style-night/symbols/dot-s-light.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - dot-s-light - Created with Sketch. - - - \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/dot-s.svg b/data/styles/clear/style-night/symbols/dot-s.svg index 2d9c8cea45..a749dc530b 100644 --- a/data/styles/clear/style-night/symbols/dot-s.svg +++ b/data/styles/clear/style-night/symbols/dot-s.svg @@ -1,14 +1,3 @@ - - - - dot-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-night/symbols/drinking-water-l.svg b/data/styles/clear/style-night/symbols/drinking-water-l.svg index 4aa298b3f1..190352e933 100644 --- a/data/styles/clear/style-night/symbols/drinking-water-l.svg +++ b/data/styles/clear/style-night/symbols/drinking-water-l.svg @@ -1,14 +1,7 @@ - - - - drinking-water-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/drinking-water-m.svg b/data/styles/clear/style-night/symbols/drinking-water-m.svg index 2fb8ad270e..14613a276a 100644 --- a/data/styles/clear/style-night/symbols/drinking-water-m.svg +++ b/data/styles/clear/style-night/symbols/drinking-water-m.svg @@ -1,14 +1,7 @@ - - - - drinking-water-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/drinking-water-s.svg b/data/styles/clear/style-night/symbols/drinking-water-s.svg index 4545293cdf..1aae4317f1 100644 --- a/data/styles/clear/style-night/symbols/drinking-water-s.svg +++ b/data/styles/clear/style-night/symbols/drinking-water-s.svg @@ -1,14 +1,7 @@ - - - - drinking-water-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/electronics-l.svg b/data/styles/clear/style-night/symbols/electronics-l.svg index eba0ef0ec7..6e65372cb9 100644 --- a/data/styles/clear/style-night/symbols/electronics-l.svg +++ b/data/styles/clear/style-night/symbols/electronics-l.svg @@ -1,20 +1,7 @@ - - - - electronics-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/electronics-m.svg b/data/styles/clear/style-night/symbols/electronics-m.svg index cfbcafc84a..be3d082636 100644 --- a/data/styles/clear/style-night/symbols/electronics-m.svg +++ b/data/styles/clear/style-night/symbols/electronics-m.svg @@ -1,20 +1,7 @@ - - - - electronics-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/electronics-s.svg b/data/styles/clear/style-night/symbols/electronics-s.svg new file mode 100644 index 0000000000..bf7977d059 --- /dev/null +++ b/data/styles/clear/style-night/symbols/electronics-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/embassy-l.svg b/data/styles/clear/style-night/symbols/embassy-l.svg index 2fe074e6d7..08bf7af63e 100644 --- a/data/styles/clear/style-night/symbols/embassy-l.svg +++ b/data/styles/clear/style-night/symbols/embassy-l.svg @@ -1,14 +1,7 @@ - - - - embassy-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/embassy-m.svg b/data/styles/clear/style-night/symbols/embassy-m.svg index 779a676a98..df69ac9081 100644 --- a/data/styles/clear/style-night/symbols/embassy-m.svg +++ b/data/styles/clear/style-night/symbols/embassy-m.svg @@ -1,14 +1,7 @@ - - - - embassy-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/embassy-s.svg b/data/styles/clear/style-night/symbols/embassy-s.svg index 07e831636e..dade9a3d37 100644 --- a/data/styles/clear/style-night/symbols/embassy-s.svg +++ b/data/styles/clear/style-night/symbols/embassy-s.svg @@ -1,14 +1,7 @@ - - - - embassy-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/entrance-s.svg b/data/styles/clear/style-night/symbols/entrance-s.svg index e1edcb6ba4..15ce0a9b64 100644 --- a/data/styles/clear/style-night/symbols/entrance-s.svg +++ b/data/styles/clear/style-night/symbols/entrance-s.svg @@ -1,13 +1,6 @@ - - - - entrance-s - Created with Sketch. - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/entrance-xs.svg b/data/styles/clear/style-night/symbols/entrance-xs.svg index 13e601cc66..b1a8eab661 100644 --- a/data/styles/clear/style-night/symbols/entrance-xs.svg +++ b/data/styles/clear/style-night/symbols/entrance-xs.svg @@ -1,12 +1,3 @@ - - - - entrance-xs - Created with Sketch. - - - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-night/symbols/equestrian-l.svg b/data/styles/clear/style-night/symbols/equestrian-l.svg index ce4719bc0f..a1e09ef8df 100644 --- a/data/styles/clear/style-night/symbols/equestrian-l.svg +++ b/data/styles/clear/style-night/symbols/equestrian-l.svg @@ -1,16 +1,7 @@ - - - - equestrian-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/equestrian-m.svg b/data/styles/clear/style-night/symbols/equestrian-m.svg index 86a1bc47f9..514afbe32f 100644 --- a/data/styles/clear/style-night/symbols/equestrian-m.svg +++ b/data/styles/clear/style-night/symbols/equestrian-m.svg @@ -1,14 +1,7 @@ - - - - equestrian-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/equestrian-s.svg b/data/styles/clear/style-night/symbols/equestrian-s.svg new file mode 100644 index 0000000000..40bace62f1 --- /dev/null +++ b/data/styles/clear/style-night/symbols/equestrian-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/fastfood-l.svg b/data/styles/clear/style-night/symbols/fastfood-l.svg index 68bb0198b6..732fb715c0 100644 --- a/data/styles/clear/style-night/symbols/fastfood-l.svg +++ b/data/styles/clear/style-night/symbols/fastfood-l.svg @@ -1,18 +1,7 @@ - - - - fastfood-l - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/fastfood-m.svg b/data/styles/clear/style-night/symbols/fastfood-m.svg index 3387e55c28..4692ddf717 100644 --- a/data/styles/clear/style-night/symbols/fastfood-m.svg +++ b/data/styles/clear/style-night/symbols/fastfood-m.svg @@ -1,16 +1,7 @@ - - - - fastfood-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/fastfood-s.svg b/data/styles/clear/style-night/symbols/fastfood-s.svg index 12d81c2985..52de59d4ab 100644 --- a/data/styles/clear/style-night/symbols/fastfood-s.svg +++ b/data/styles/clear/style-night/symbols/fastfood-s.svg @@ -1,16 +1,7 @@ - - - - fastfood-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/fire_station-l.svg b/data/styles/clear/style-night/symbols/fire_station-l.svg index 083cf8d4a3..da0388f2f6 100644 --- a/data/styles/clear/style-night/symbols/fire_station-l.svg +++ b/data/styles/clear/style-night/symbols/fire_station-l.svg @@ -1,14 +1,7 @@ - - - - fire_station-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/fire_station-m.svg b/data/styles/clear/style-night/symbols/fire_station-m.svg index 6502aaf291..96c5920934 100644 --- a/data/styles/clear/style-night/symbols/fire_station-m.svg +++ b/data/styles/clear/style-night/symbols/fire_station-m.svg @@ -1,14 +1,7 @@ - - - - fire_station-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/fire_station-s.svg b/data/styles/clear/style-night/symbols/fire_station-s.svg index 9ca2f21a45..68c26ec3c5 100644 --- a/data/styles/clear/style-night/symbols/fire_station-s.svg +++ b/data/styles/clear/style-night/symbols/fire_station-s.svg @@ -1,14 +1,7 @@ - - - - fire_station-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/firehydrant-l.svg b/data/styles/clear/style-night/symbols/firehydrant-l.svg index 07d4eadfb2..79d3125915 100644 --- a/data/styles/clear/style-night/symbols/firehydrant-l.svg +++ b/data/styles/clear/style-night/symbols/firehydrant-l.svg @@ -1,22 +1,6 @@ - - - - firehydrant-l - Created with Sketch. - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/firehydrant-m.svg b/data/styles/clear/style-night/symbols/firehydrant-m.svg new file mode 100644 index 0000000000..a0f851bb71 --- /dev/null +++ b/data/styles/clear/style-night/symbols/firehydrant-m.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/data/styles/clear/style-night/symbols/firehydrant-s.svg b/data/styles/clear/style-night/symbols/firehydrant-s.svg new file mode 100644 index 0000000000..76cdd13825 --- /dev/null +++ b/data/styles/clear/style-night/symbols/firehydrant-s.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/data/styles/clear/style-night/symbols/florist-l.svg b/data/styles/clear/style-night/symbols/florist-l.svg index 3bba58565b..045ff58e6c 100644 --- a/data/styles/clear/style-night/symbols/florist-l.svg +++ b/data/styles/clear/style-night/symbols/florist-l.svg @@ -1,20 +1,7 @@ - - - - florist-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/florist-m.svg b/data/styles/clear/style-night/symbols/florist-m.svg index 4f0c68d4d2..d86e8f1a08 100644 --- a/data/styles/clear/style-night/symbols/florist-m.svg +++ b/data/styles/clear/style-night/symbols/florist-m.svg @@ -1,20 +1,7 @@ - - - - florist-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/florist-s.svg b/data/styles/clear/style-night/symbols/florist-s.svg new file mode 100644 index 0000000000..8e9c3c1cb9 --- /dev/null +++ b/data/styles/clear/style-night/symbols/florist-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/fountain-l.svg b/data/styles/clear/style-night/symbols/fountain-l.svg index 0b740a8948..54385fbbba 100644 --- a/data/styles/clear/style-night/symbols/fountain-l.svg +++ b/data/styles/clear/style-night/symbols/fountain-l.svg @@ -1,14 +1,7 @@ - - - - fountain-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/fountain-m.svg b/data/styles/clear/style-night/symbols/fountain-m.svg index cd2326b9f6..7ad132af29 100644 --- a/data/styles/clear/style-night/symbols/fountain-m.svg +++ b/data/styles/clear/style-night/symbols/fountain-m.svg @@ -1,14 +1,7 @@ - - - - fountain-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/fountain-s.svg b/data/styles/clear/style-night/symbols/fountain-s.svg index 1aa85e5441..a044f7e90d 100644 --- a/data/styles/clear/style-night/symbols/fountain-s.svg +++ b/data/styles/clear/style-night/symbols/fountain-s.svg @@ -1,14 +1,7 @@ - - - - fountain-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/fuel-l.svg b/data/styles/clear/style-night/symbols/fuel-l.svg index ad9c4d010b..6cefee600c 100644 --- a/data/styles/clear/style-night/symbols/fuel-l.svg +++ b/data/styles/clear/style-night/symbols/fuel-l.svg @@ -1,27 +1,7 @@ - - - - fuel-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/fuel-m.svg b/data/styles/clear/style-night/symbols/fuel-m.svg index 7669bfeec9..b99650ab86 100644 --- a/data/styles/clear/style-night/symbols/fuel-m.svg +++ b/data/styles/clear/style-night/symbols/fuel-m.svg @@ -1,16 +1,7 @@ - - - - fuel-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/fuel-s.svg b/data/styles/clear/style-night/symbols/fuel-s.svg index 77b8db80af..14945b6fd0 100644 --- a/data/styles/clear/style-night/symbols/fuel-s.svg +++ b/data/styles/clear/style-night/symbols/fuel-s.svg @@ -1,16 +1,7 @@ - - - - fuel-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/funicular-l.svg b/data/styles/clear/style-night/symbols/funicular-l.svg index 7065c7d246..765a9d451c 100644 --- a/data/styles/clear/style-night/symbols/funicular-l.svg +++ b/data/styles/clear/style-night/symbols/funicular-l.svg @@ -1,18 +1,7 @@ - - - - funicular-l - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/funicular-m.svg b/data/styles/clear/style-night/symbols/funicular-m.svg index 7ce84aec57..f7134bba24 100644 --- a/data/styles/clear/style-night/symbols/funicular-m.svg +++ b/data/styles/clear/style-night/symbols/funicular-m.svg @@ -1,18 +1,7 @@ - - - - funicular-m - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/funicular-s.svg b/data/styles/clear/style-night/symbols/funicular-s.svg index 6e73ec1028..5fbe39fa95 100644 --- a/data/styles/clear/style-night/symbols/funicular-s.svg +++ b/data/styles/clear/style-night/symbols/funicular-s.svg @@ -1,18 +1,7 @@ - - - - funicular-s - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/furniture-l.svg b/data/styles/clear/style-night/symbols/furniture-l.svg index 9d68334268..55adea53e2 100644 --- a/data/styles/clear/style-night/symbols/furniture-l.svg +++ b/data/styles/clear/style-night/symbols/furniture-l.svg @@ -1,20 +1,7 @@ - - - - furniture-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/furniture-m.svg b/data/styles/clear/style-night/symbols/furniture-m.svg index 1bb801066b..7f4060e21e 100644 --- a/data/styles/clear/style-night/symbols/furniture-m.svg +++ b/data/styles/clear/style-night/symbols/furniture-m.svg @@ -1,20 +1,7 @@ - - - - furniture-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/furniture-s.svg b/data/styles/clear/style-night/symbols/furniture-s.svg new file mode 100644 index 0000000000..8fea2b24f9 --- /dev/null +++ b/data/styles/clear/style-night/symbols/furniture-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/gallery-l.svg b/data/styles/clear/style-night/symbols/gallery-l.svg index 59b5f920d4..baf301c209 100644 --- a/data/styles/clear/style-night/symbols/gallery-l.svg +++ b/data/styles/clear/style-night/symbols/gallery-l.svg @@ -1,14 +1,7 @@ - - - - gallery-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/gallery-m.svg b/data/styles/clear/style-night/symbols/gallery-m.svg index feefc50f92..8733240125 100644 --- a/data/styles/clear/style-night/symbols/gallery-m.svg +++ b/data/styles/clear/style-night/symbols/gallery-m.svg @@ -1,14 +1,7 @@ - - - - gallery-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/gallery-s.svg b/data/styles/clear/style-night/symbols/gallery-s.svg index 99c11a2dab..9928b79ffc 100644 --- a/data/styles/clear/style-night/symbols/gallery-s.svg +++ b/data/styles/clear/style-night/symbols/gallery-s.svg @@ -1,14 +1,7 @@ - - - - gallery-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/garden-l.svg b/data/styles/clear/style-night/symbols/garden-l.svg index 74665af891..ff4e7798cd 100644 --- a/data/styles/clear/style-night/symbols/garden-l.svg +++ b/data/styles/clear/style-night/symbols/garden-l.svg @@ -1,14 +1,7 @@ - - - - garden-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/garden-m.svg b/data/styles/clear/style-night/symbols/garden-m.svg index 7e24f05f72..5206c1f1a1 100644 --- a/data/styles/clear/style-night/symbols/garden-m.svg +++ b/data/styles/clear/style-night/symbols/garden-m.svg @@ -1,14 +1,7 @@ - - - - garden-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/garden-s.svg b/data/styles/clear/style-night/symbols/garden-s.svg index 9725a9cc97..f95da33040 100644 --- a/data/styles/clear/style-night/symbols/garden-s.svg +++ b/data/styles/clear/style-night/symbols/garden-s.svg @@ -1,14 +1,7 @@ - - - - garden-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/garden_center-l.svg b/data/styles/clear/style-night/symbols/garden_center-l.svg index cdc0a0499a..ce57410216 100644 --- a/data/styles/clear/style-night/symbols/garden_center-l.svg +++ b/data/styles/clear/style-night/symbols/garden_center-l.svg @@ -1,20 +1,7 @@ - - - - garden_center-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/garden_center-m.svg b/data/styles/clear/style-night/symbols/garden_center-m.svg index 320add778a..2cbc9e8d13 100644 --- a/data/styles/clear/style-night/symbols/garden_center-m.svg +++ b/data/styles/clear/style-night/symbols/garden_center-m.svg @@ -1,20 +1,7 @@ - - - - garden_center-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/garden_center-s.svg b/data/styles/clear/style-night/symbols/garden_center-s.svg new file mode 100644 index 0000000000..5bc1ec7b19 --- /dev/null +++ b/data/styles/clear/style-night/symbols/garden_center-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/gate-l.svg b/data/styles/clear/style-night/symbols/gate-l.svg index 4c9bc931ca..8a8861be11 100644 --- a/data/styles/clear/style-night/symbols/gate-l.svg +++ b/data/styles/clear/style-night/symbols/gate-l.svg @@ -1,14 +1,7 @@ - - - - gate-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/gate-m.svg b/data/styles/clear/style-night/symbols/gate-m.svg index 78c8ca6757..4dd8f7814e 100644 --- a/data/styles/clear/style-night/symbols/gate-m.svg +++ b/data/styles/clear/style-night/symbols/gate-m.svg @@ -1,14 +1,7 @@ - - - - gate-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/gate-s.svg b/data/styles/clear/style-night/symbols/gate-s.svg new file mode 100644 index 0000000000..0272ce0049 --- /dev/null +++ b/data/styles/clear/style-night/symbols/gate-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/gift-l.svg b/data/styles/clear/style-night/symbols/gift-l.svg index d8258860d3..8a639e91bc 100644 --- a/data/styles/clear/style-night/symbols/gift-l.svg +++ b/data/styles/clear/style-night/symbols/gift-l.svg @@ -1,20 +1,7 @@ - - - - gift-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/gift-m.svg b/data/styles/clear/style-night/symbols/gift-m.svg index 8991a18930..678f975e58 100644 --- a/data/styles/clear/style-night/symbols/gift-m.svg +++ b/data/styles/clear/style-night/symbols/gift-m.svg @@ -1,20 +1,7 @@ - - - - gift-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/gift-s.svg b/data/styles/clear/style-night/symbols/gift-s.svg new file mode 100644 index 0000000000..700a3b3952 --- /dev/null +++ b/data/styles/clear/style-night/symbols/gift-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/golf-l.svg b/data/styles/clear/style-night/symbols/golf-l.svg index 67f7595f30..4d65c723db 100644 --- a/data/styles/clear/style-night/symbols/golf-l.svg +++ b/data/styles/clear/style-night/symbols/golf-l.svg @@ -1,14 +1,7 @@ - - - - golf-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/golf-m.svg b/data/styles/clear/style-night/symbols/golf-m.svg index 792252b2c0..b2b22896c5 100644 --- a/data/styles/clear/style-night/symbols/golf-m.svg +++ b/data/styles/clear/style-night/symbols/golf-m.svg @@ -1,14 +1,7 @@ - - - - golf-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/golf-s.svg b/data/styles/clear/style-night/symbols/golf-s.svg index 07bed180c9..2f02620c9a 100644 --- a/data/styles/clear/style-night/symbols/golf-s.svg +++ b/data/styles/clear/style-night/symbols/golf-s.svg @@ -1,14 +1,7 @@ - - - - golf-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/greengrocer-l.svg b/data/styles/clear/style-night/symbols/greengrocer-l.svg index d528032b06..da404466e6 100644 --- a/data/styles/clear/style-night/symbols/greengrocer-l.svg +++ b/data/styles/clear/style-night/symbols/greengrocer-l.svg @@ -1,20 +1,7 @@ - - - - greengrocer-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/greengrocer-m.svg b/data/styles/clear/style-night/symbols/greengrocer-m.svg index c856cf991c..e96e21899b 100644 --- a/data/styles/clear/style-night/symbols/greengrocer-m.svg +++ b/data/styles/clear/style-night/symbols/greengrocer-m.svg @@ -1,20 +1,7 @@ - - - - greengrocer-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/greengrocer-s.svg b/data/styles/clear/style-night/symbols/greengrocer-s.svg new file mode 100644 index 0000000000..1aab7cef19 --- /dev/null +++ b/data/styles/clear/style-night/symbols/greengrocer-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/grocery-l.svg b/data/styles/clear/style-night/symbols/grocery-l.svg index 1f41122748..dc1744b02d 100644 --- a/data/styles/clear/style-night/symbols/grocery-l.svg +++ b/data/styles/clear/style-night/symbols/grocery-l.svg @@ -1,20 +1,7 @@ - - - - grocery-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/grocery-m.svg b/data/styles/clear/style-night/symbols/grocery-m.svg index 503ee2abfe..ace551697d 100644 --- a/data/styles/clear/style-night/symbols/grocery-m.svg +++ b/data/styles/clear/style-night/symbols/grocery-m.svg @@ -1,24 +1,7 @@ - - - - grocery-m - Created with Sketch. - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/grocery-s.svg b/data/styles/clear/style-night/symbols/grocery-s.svg index 8a64850e6c..fbb979121f 100644 --- a/data/styles/clear/style-night/symbols/grocery-s.svg +++ b/data/styles/clear/style-night/symbols/grocery-s.svg @@ -1,20 +1,7 @@ - - - - grocery-s - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/gym-l.svg b/data/styles/clear/style-night/symbols/gym-l.svg index 403985bb9f..a9516894a6 100644 --- a/data/styles/clear/style-night/symbols/gym-l.svg +++ b/data/styles/clear/style-night/symbols/gym-l.svg @@ -1,20 +1,7 @@ - - - - gym-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/gym-m.svg b/data/styles/clear/style-night/symbols/gym-m.svg index 48752249d9..c5748b474b 100644 --- a/data/styles/clear/style-night/symbols/gym-m.svg +++ b/data/styles/clear/style-night/symbols/gym-m.svg @@ -1,14 +1,7 @@ - - - - gym-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/gym-s.svg b/data/styles/clear/style-night/symbols/gym-s.svg index 3f09708c4e..3f51042150 100644 --- a/data/styles/clear/style-night/symbols/gym-s.svg +++ b/data/styles/clear/style-night/symbols/gym-s.svg @@ -1,14 +1,7 @@ - - - - gym-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/hairdresser-l.svg b/data/styles/clear/style-night/symbols/hairdresser-l.svg index 4fde4ad0a7..3ebc1fbd03 100644 --- a/data/styles/clear/style-night/symbols/hairdresser-l.svg +++ b/data/styles/clear/style-night/symbols/hairdresser-l.svg @@ -1,14 +1,7 @@ - - - - hairdresser-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/hairdresser-m.svg b/data/styles/clear/style-night/symbols/hairdresser-m.svg index 06ee51b240..a2d3f72252 100644 --- a/data/styles/clear/style-night/symbols/hairdresser-m.svg +++ b/data/styles/clear/style-night/symbols/hairdresser-m.svg @@ -1,14 +1,7 @@ - - - - hairdresser-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/hairdresser-s.svg b/data/styles/clear/style-night/symbols/hairdresser-s.svg new file mode 100644 index 0000000000..36a5d03373 --- /dev/null +++ b/data/styles/clear/style-night/symbols/hairdresser-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/hand-l.svg b/data/styles/clear/style-night/symbols/hand-l.svg index 3f236951ef..f5a0d12ffc 100644 --- a/data/styles/clear/style-night/symbols/hand-l.svg +++ b/data/styles/clear/style-night/symbols/hand-l.svg @@ -1,20 +1,7 @@ - - - - hand-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/hand-m.svg b/data/styles/clear/style-night/symbols/hand-m.svg index 8ccd89a43d..2508cdd3a6 100644 --- a/data/styles/clear/style-night/symbols/hand-m.svg +++ b/data/styles/clear/style-night/symbols/hand-m.svg @@ -1,20 +1,7 @@ - - - - hand-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/hand-s.svg b/data/styles/clear/style-night/symbols/hand-s.svg new file mode 100644 index 0000000000..1536528193 --- /dev/null +++ b/data/styles/clear/style-night/symbols/hand-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/hardware-l.svg b/data/styles/clear/style-night/symbols/hardware-l.svg index ea5647e278..a7f6abaf6f 100644 --- a/data/styles/clear/style-night/symbols/hardware-l.svg +++ b/data/styles/clear/style-night/symbols/hardware-l.svg @@ -1,20 +1,7 @@ - - - - hardware-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/hardware-m.svg b/data/styles/clear/style-night/symbols/hardware-m.svg index bfe622679d..e3bb87bf87 100644 --- a/data/styles/clear/style-night/symbols/hardware-m.svg +++ b/data/styles/clear/style-night/symbols/hardware-m.svg @@ -1,20 +1,7 @@ - - - - hardware-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/hardware-s.svg b/data/styles/clear/style-night/symbols/hardware-s.svg new file mode 100644 index 0000000000..4bc2ce9860 --- /dev/null +++ b/data/styles/clear/style-night/symbols/hardware-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/helipad-l.svg b/data/styles/clear/style-night/symbols/helipad-l.svg index 9dc41be63e..c306064fed 100644 --- a/data/styles/clear/style-night/symbols/helipad-l.svg +++ b/data/styles/clear/style-night/symbols/helipad-l.svg @@ -1,22 +1,7 @@ - - - - helipad-l - Created with Sketch. - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/helipad-m.svg b/data/styles/clear/style-night/symbols/helipad-m.svg index da4bfccb42..abe30f9931 100644 --- a/data/styles/clear/style-night/symbols/helipad-m.svg +++ b/data/styles/clear/style-night/symbols/helipad-m.svg @@ -1,20 +1,7 @@ - - - - helipad-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/helipad-s.svg b/data/styles/clear/style-night/symbols/helipad-s.svg index 7db07f2c89..3b7ec88540 100644 --- a/data/styles/clear/style-night/symbols/helipad-s.svg +++ b/data/styles/clear/style-night/symbols/helipad-s.svg @@ -1,14 +1,7 @@ - - - - helipad-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/heliport-l.svg b/data/styles/clear/style-night/symbols/heliport-l.svg index bb04cb2ce3..1169431173 100644 --- a/data/styles/clear/style-night/symbols/heliport-l.svg +++ b/data/styles/clear/style-night/symbols/heliport-l.svg @@ -1,14 +1,7 @@ - - - - heliport-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/heliport-m.svg b/data/styles/clear/style-night/symbols/heliport-m.svg index 7602a0e452..ab4e497c96 100644 --- a/data/styles/clear/style-night/symbols/heliport-m.svg +++ b/data/styles/clear/style-night/symbols/heliport-m.svg @@ -1,19 +1,7 @@ - - - - heliport-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/heliport-s.svg b/data/styles/clear/style-night/symbols/heliport-s.svg index 4439d8877f..60e9db3316 100644 --- a/data/styles/clear/style-night/symbols/heliport-s.svg +++ b/data/styles/clear/style-night/symbols/heliport-s.svg @@ -1,18 +1,7 @@ - - - - heliport-s - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/hindu-l.svg b/data/styles/clear/style-night/symbols/hindu-l.svg index 3240e55ef2..e70c9927b9 100644 --- a/data/styles/clear/style-night/symbols/hindu-l.svg +++ b/data/styles/clear/style-night/symbols/hindu-l.svg @@ -1,16 +1,7 @@ - - - - hindu-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/hindu-m.svg b/data/styles/clear/style-night/symbols/hindu-m.svg index 8efdb64033..9601b15a4f 100644 --- a/data/styles/clear/style-night/symbols/hindu-m.svg +++ b/data/styles/clear/style-night/symbols/hindu-m.svg @@ -1,16 +1,7 @@ - - - - hindu-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/hindu-s.svg b/data/styles/clear/style-night/symbols/hindu-s.svg index 7ffc8020fc..514fd25de0 100644 --- a/data/styles/clear/style-night/symbols/hindu-s.svg +++ b/data/styles/clear/style-night/symbols/hindu-s.svg @@ -1,16 +1,7 @@ - - - - hindu-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/historic-ship-l.svg b/data/styles/clear/style-night/symbols/historic-ship-l.svg index 88b30909ff..9e340c4f0a 100644 --- a/data/styles/clear/style-night/symbols/historic-ship-l.svg +++ b/data/styles/clear/style-night/symbols/historic-ship-l.svg @@ -1,14 +1,7 @@ - - - - historic-ship-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/historic-ship-m.svg b/data/styles/clear/style-night/symbols/historic-ship-m.svg index 2e63035f82..3938452871 100644 --- a/data/styles/clear/style-night/symbols/historic-ship-m.svg +++ b/data/styles/clear/style-night/symbols/historic-ship-m.svg @@ -1,14 +1,7 @@ - - - - historic-ship-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/historic-ship-s.svg b/data/styles/clear/style-night/symbols/historic-ship-s.svg new file mode 100644 index 0000000000..dfe9fde86f --- /dev/null +++ b/data/styles/clear/style-night/symbols/historic-ship-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/hospital-l.svg b/data/styles/clear/style-night/symbols/hospital-l.svg index 5dbb6699d9..fab6449424 100644 --- a/data/styles/clear/style-night/symbols/hospital-l.svg +++ b/data/styles/clear/style-night/symbols/hospital-l.svg @@ -1,16 +1,7 @@ - - - - hospital-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/hospital-m.svg b/data/styles/clear/style-night/symbols/hospital-m.svg index 59531f7345..f0aaed4e52 100644 --- a/data/styles/clear/style-night/symbols/hospital-m.svg +++ b/data/styles/clear/style-night/symbols/hospital-m.svg @@ -1,16 +1,7 @@ - - - - hospital-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/hospital-s.svg b/data/styles/clear/style-night/symbols/hospital-s.svg index 400264a4dd..b56f11cfb8 100644 --- a/data/styles/clear/style-night/symbols/hospital-s.svg +++ b/data/styles/clear/style-night/symbols/hospital-s.svg @@ -1,16 +1,7 @@ - - - - hospital-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/hostel-l.svg b/data/styles/clear/style-night/symbols/hostel-l.svg new file mode 100644 index 0000000000..d5f6297ba5 --- /dev/null +++ b/data/styles/clear/style-night/symbols/hostel-l.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/hostel-m.svg b/data/styles/clear/style-night/symbols/hostel-m.svg new file mode 100644 index 0000000000..52ffa78138 --- /dev/null +++ b/data/styles/clear/style-night/symbols/hostel-m.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/hostel-s.svg b/data/styles/clear/style-night/symbols/hostel-s.svg new file mode 100644 index 0000000000..ddbd8d2af5 --- /dev/null +++ b/data/styles/clear/style-night/symbols/hostel-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/hotel-l.svg b/data/styles/clear/style-night/symbols/hotel-l.svg index 88d71f51e1..2a6291d8df 100644 --- a/data/styles/clear/style-night/symbols/hotel-l.svg +++ b/data/styles/clear/style-night/symbols/hotel-l.svg @@ -1,14 +1,7 @@ - - - - hotel-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/hotel-m.svg b/data/styles/clear/style-night/symbols/hotel-m.svg index 28d64a48ca..dd8016eb3e 100644 --- a/data/styles/clear/style-night/symbols/hotel-m.svg +++ b/data/styles/clear/style-night/symbols/hotel-m.svg @@ -1,14 +1,7 @@ - - - - hotel-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/hotel-s.svg b/data/styles/clear/style-night/symbols/hotel-s.svg index c9beb55564..27807a19b4 100644 --- a/data/styles/clear/style-night/symbols/hotel-s.svg +++ b/data/styles/clear/style-night/symbols/hotel-s.svg @@ -1,14 +1,7 @@ - - - - hotel-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/hunting-tower-l.svg b/data/styles/clear/style-night/symbols/hunting-tower-l.svg index 69ac0ea3e2..587a14300c 100644 --- a/data/styles/clear/style-night/symbols/hunting-tower-l.svg +++ b/data/styles/clear/style-night/symbols/hunting-tower-l.svg @@ -1,18 +1,7 @@ - - - - hunting-tower-l - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/hunting-tower-m.svg b/data/styles/clear/style-night/symbols/hunting-tower-m.svg index ecac0323a5..2bba87dfeb 100644 --- a/data/styles/clear/style-night/symbols/hunting-tower-m.svg +++ b/data/styles/clear/style-night/symbols/hunting-tower-m.svg @@ -1,18 +1,7 @@ - - - - hunting-tower-m - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/hunting-tower-s.svg b/data/styles/clear/style-night/symbols/hunting-tower-s.svg new file mode 100644 index 0000000000..207abca889 --- /dev/null +++ b/data/styles/clear/style-night/symbols/hunting-tower-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/information-l.svg b/data/styles/clear/style-night/symbols/information-l.svg index f10e5901cf..6e43acd7c1 100644 --- a/data/styles/clear/style-night/symbols/information-l.svg +++ b/data/styles/clear/style-night/symbols/information-l.svg @@ -1,14 +1,7 @@ - - - - information-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/information-m.svg b/data/styles/clear/style-night/symbols/information-m.svg index 3b965906bf..bf2476b7e2 100644 --- a/data/styles/clear/style-night/symbols/information-m.svg +++ b/data/styles/clear/style-night/symbols/information-m.svg @@ -1,14 +1,7 @@ - - - - information-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/information-s.svg b/data/styles/clear/style-night/symbols/information-s.svg index 6601f0c759..12cddf4e72 100644 --- a/data/styles/clear/style-night/symbols/information-s.svg +++ b/data/styles/clear/style-night/symbols/information-s.svg @@ -1,14 +1,7 @@ - - - - information-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/jewelry-l.svg b/data/styles/clear/style-night/symbols/jewelry-l.svg index d51abfc3b3..0460036630 100644 --- a/data/styles/clear/style-night/symbols/jewelry-l.svg +++ b/data/styles/clear/style-night/symbols/jewelry-l.svg @@ -1,20 +1,7 @@ - - - - jewelry-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/jewelry-m.svg b/data/styles/clear/style-night/symbols/jewelry-m.svg index 5ed959c5dc..62038a98f2 100644 --- a/data/styles/clear/style-night/symbols/jewelry-m.svg +++ b/data/styles/clear/style-night/symbols/jewelry-m.svg @@ -1,20 +1,7 @@ - - - - jewelry-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/jewelry-s.svg b/data/styles/clear/style-night/symbols/jewelry-s.svg new file mode 100644 index 0000000000..28448198a4 --- /dev/null +++ b/data/styles/clear/style-night/symbols/jewelry-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/jewish-l.svg b/data/styles/clear/style-night/symbols/jewish-l.svg index a954b23b73..7a9a3d72f6 100644 --- a/data/styles/clear/style-night/symbols/jewish-l.svg +++ b/data/styles/clear/style-night/symbols/jewish-l.svg @@ -1,16 +1,7 @@ - - - - jewish-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/jewish-m.svg b/data/styles/clear/style-night/symbols/jewish-m.svg index 97eb9d2a65..d19278b77e 100644 --- a/data/styles/clear/style-night/symbols/jewish-m.svg +++ b/data/styles/clear/style-night/symbols/jewish-m.svg @@ -1,16 +1,7 @@ - - - - jewish-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/jewish-s.svg b/data/styles/clear/style-night/symbols/jewish-s.svg index b3fddbe6b2..fa0a3e863e 100644 --- a/data/styles/clear/style-night/symbols/jewish-s.svg +++ b/data/styles/clear/style-night/symbols/jewish-s.svg @@ -1,16 +1,7 @@ - - - - jewish-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/kindergarten-l.svg b/data/styles/clear/style-night/symbols/kindergarten-l.svg index 89208ae6d5..2c29d632f7 100644 --- a/data/styles/clear/style-night/symbols/kindergarten-l.svg +++ b/data/styles/clear/style-night/symbols/kindergarten-l.svg @@ -1,16 +1,7 @@ - - - - kindergarten-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/kindergarten-m.svg b/data/styles/clear/style-night/symbols/kindergarten-m.svg index 1ba169f77d..3089aca6ca 100644 --- a/data/styles/clear/style-night/symbols/kindergarten-m.svg +++ b/data/styles/clear/style-night/symbols/kindergarten-m.svg @@ -1,14 +1,7 @@ - - - - kindergarten-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/kindergarten-s.svg b/data/styles/clear/style-night/symbols/kindergarten-s.svg index 91ceb65b7a..346bc0d517 100644 --- a/data/styles/clear/style-night/symbols/kindergarten-s.svg +++ b/data/styles/clear/style-night/symbols/kindergarten-s.svg @@ -1,14 +1,7 @@ - - - - kindergarten-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/kiosk-l.svg b/data/styles/clear/style-night/symbols/kiosk-l.svg index 43d538ce29..99d2fa5bf3 100644 --- a/data/styles/clear/style-night/symbols/kiosk-l.svg +++ b/data/styles/clear/style-night/symbols/kiosk-l.svg @@ -1,20 +1,7 @@ - - - - kiosk-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/kiosk-m.svg b/data/styles/clear/style-night/symbols/kiosk-m.svg index 766be30f18..e29b56f175 100644 --- a/data/styles/clear/style-night/symbols/kiosk-m.svg +++ b/data/styles/clear/style-night/symbols/kiosk-m.svg @@ -1,20 +1,7 @@ - - - - kiosk-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/kiosk-s.svg b/data/styles/clear/style-night/symbols/kiosk-s.svg new file mode 100644 index 0000000000..3bf3b5f21f --- /dev/null +++ b/data/styles/clear/style-night/symbols/kiosk-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/laundry-l.svg b/data/styles/clear/style-night/symbols/laundry-l.svg index 07674c0e83..741bcab443 100644 --- a/data/styles/clear/style-night/symbols/laundry-l.svg +++ b/data/styles/clear/style-night/symbols/laundry-l.svg @@ -1,18 +1,7 @@ - - - - laundry-l - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/laundry-m.svg b/data/styles/clear/style-night/symbols/laundry-m.svg index 3cf31861cf..c296dc4bfa 100644 --- a/data/styles/clear/style-night/symbols/laundry-m.svg +++ b/data/styles/clear/style-night/symbols/laundry-m.svg @@ -1,18 +1,7 @@ - - - - laundry-m - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/laundry-s.svg b/data/styles/clear/style-night/symbols/laundry-s.svg new file mode 100644 index 0000000000..3ca5821928 --- /dev/null +++ b/data/styles/clear/style-night/symbols/laundry-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/lawyer-l.svg b/data/styles/clear/style-night/symbols/lawyer-l.svg index 6ab963cd08..60cf68382b 100644 --- a/data/styles/clear/style-night/symbols/lawyer-l.svg +++ b/data/styles/clear/style-night/symbols/lawyer-l.svg @@ -1,20 +1,7 @@ - - - - lawyer-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/lawyer-m.svg b/data/styles/clear/style-night/symbols/lawyer-m.svg new file mode 100644 index 0000000000..c33dc8ca8d --- /dev/null +++ b/data/styles/clear/style-night/symbols/lawyer-m.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/lawyer-s.svg b/data/styles/clear/style-night/symbols/lawyer-s.svg new file mode 100644 index 0000000000..8aa9513e38 --- /dev/null +++ b/data/styles/clear/style-night/symbols/lawyer-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/library-l.svg b/data/styles/clear/style-night/symbols/library-l.svg index dc25dd1c13..316953505b 100644 --- a/data/styles/clear/style-night/symbols/library-l.svg +++ b/data/styles/clear/style-night/symbols/library-l.svg @@ -1,15 +1,7 @@ - - - - library-l - Created with Sketch. - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/library-m.svg b/data/styles/clear/style-night/symbols/library-m.svg index bdcd5e58e5..6132cf597f 100644 --- a/data/styles/clear/style-night/symbols/library-m.svg +++ b/data/styles/clear/style-night/symbols/library-m.svg @@ -1,14 +1,7 @@ - - - - library-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/library-s.svg b/data/styles/clear/style-night/symbols/library-s.svg index de4c3f275a..68139502c9 100644 --- a/data/styles/clear/style-night/symbols/library-s.svg +++ b/data/styles/clear/style-night/symbols/library-s.svg @@ -1,14 +1,7 @@ - - - - library-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/lift_gate-l.svg b/data/styles/clear/style-night/symbols/lift_gate-l.svg index d09f9daf96..ab94c0090b 100644 --- a/data/styles/clear/style-night/symbols/lift_gate-l.svg +++ b/data/styles/clear/style-night/symbols/lift_gate-l.svg @@ -1,12 +1,6 @@ - - - - lift_gate-l - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/lift_gate-m.svg b/data/styles/clear/style-night/symbols/lift_gate-m.svg index 473e9baeab..ce833dc48e 100644 --- a/data/styles/clear/style-night/symbols/lift_gate-m.svg +++ b/data/styles/clear/style-night/symbols/lift_gate-m.svg @@ -1,12 +1,6 @@ - - - - lift_gate-m - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/lift_gate-s.svg b/data/styles/clear/style-night/symbols/lift_gate-s.svg new file mode 100644 index 0000000000..9acaa971ee --- /dev/null +++ b/data/styles/clear/style-night/symbols/lift_gate-s.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/data/styles/clear/style-night/symbols/lighthouse-l.svg b/data/styles/clear/style-night/symbols/lighthouse-l.svg index b129ee3871..575ce75275 100644 --- a/data/styles/clear/style-night/symbols/lighthouse-l.svg +++ b/data/styles/clear/style-night/symbols/lighthouse-l.svg @@ -1,14 +1,7 @@ - - - - lighthouse-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/lighthouse-m.svg b/data/styles/clear/style-night/symbols/lighthouse-m.svg index f4da5872ac..ed3cbe051e 100644 --- a/data/styles/clear/style-night/symbols/lighthouse-m.svg +++ b/data/styles/clear/style-night/symbols/lighthouse-m.svg @@ -1,14 +1,7 @@ - - - - lighthouse-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/lighthouse-s.svg b/data/styles/clear/style-night/symbols/lighthouse-s.svg index 0132092f2c..7e757a26d9 100644 --- a/data/styles/clear/style-night/symbols/lighthouse-s.svg +++ b/data/styles/clear/style-night/symbols/lighthouse-s.svg @@ -1,14 +1,7 @@ - - - - lighthouse-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/lightrail-berlin-l.svg b/data/styles/clear/style-night/symbols/lightrail-berlin-l.svg index 04824ef382..11d849cecd 100644 --- a/data/styles/clear/style-night/symbols/lightrail-berlin-l.svg +++ b/data/styles/clear/style-night/symbols/lightrail-berlin-l.svg @@ -1,21 +1,9 @@ - - - - lightrail-berlin-l - Created with Sketch. - - - - - - - - - - - - - - + + + + + + - \ No newline at end of file + + diff --git a/data/styles/clear/style-night/symbols/lightrail-berlin-m.svg b/data/styles/clear/style-night/symbols/lightrail-berlin-m.svg index 9c67f9b8f2..660e7066b4 100644 --- a/data/styles/clear/style-night/symbols/lightrail-berlin-m.svg +++ b/data/styles/clear/style-night/symbols/lightrail-berlin-m.svg @@ -1,21 +1,7 @@ - - - - lightrail-berlin-m - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/lightrail-berlin-s.svg b/data/styles/clear/style-night/symbols/lightrail-berlin-s.svg index ee9f840262..43446d3863 100644 --- a/data/styles/clear/style-night/symbols/lightrail-berlin-s.svg +++ b/data/styles/clear/style-night/symbols/lightrail-berlin-s.svg @@ -1,21 +1,7 @@ - - - - lightrail-berlin-s - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/mail-l.svg b/data/styles/clear/style-night/symbols/mail-l.svg index 356175c76a..e5a2944853 100644 --- a/data/styles/clear/style-night/symbols/mail-l.svg +++ b/data/styles/clear/style-night/symbols/mail-l.svg @@ -1,14 +1,7 @@ - - - - mail-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/mail-m.svg b/data/styles/clear/style-night/symbols/mail-m.svg index 631e00bfdc..ef89921617 100644 --- a/data/styles/clear/style-night/symbols/mail-m.svg +++ b/data/styles/clear/style-night/symbols/mail-m.svg @@ -1,14 +1,7 @@ - - - - mail-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/mail-s.svg b/data/styles/clear/style-night/symbols/mail-s.svg index bcd6e301e8..89c72e039d 100644 --- a/data/styles/clear/style-night/symbols/mail-s.svg +++ b/data/styles/clear/style-night/symbols/mail-s.svg @@ -1,14 +1,7 @@ - - - - mail-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/marketplace-l.svg b/data/styles/clear/style-night/symbols/marketplace-l.svg index c5a001db02..82c69a7fbf 100644 --- a/data/styles/clear/style-night/symbols/marketplace-l.svg +++ b/data/styles/clear/style-night/symbols/marketplace-l.svg @@ -1,20 +1,7 @@ - - - - marketplace-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/marketplace-m.svg b/data/styles/clear/style-night/symbols/marketplace-m.svg index 8230c8891d..56beb342b4 100644 --- a/data/styles/clear/style-night/symbols/marketplace-m.svg +++ b/data/styles/clear/style-night/symbols/marketplace-m.svg @@ -1,20 +1,7 @@ - - - - marketplace-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/marketplace-s.svg b/data/styles/clear/style-night/symbols/marketplace-s.svg index 9d185548f5..5baf199a77 100644 --- a/data/styles/clear/style-night/symbols/marketplace-s.svg +++ b/data/styles/clear/style-night/symbols/marketplace-s.svg @@ -1,20 +1,7 @@ - - - - marketplace-s - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/military-l.svg b/data/styles/clear/style-night/symbols/military-l.svg index e592e3ecc7..cbe2c5b692 100644 --- a/data/styles/clear/style-night/symbols/military-l.svg +++ b/data/styles/clear/style-night/symbols/military-l.svg @@ -1,15 +1,7 @@ - - - - military-l - Created with Sketch. - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/military-m.svg b/data/styles/clear/style-night/symbols/military-m.svg index b464695e62..9e2d2548ef 100644 --- a/data/styles/clear/style-night/symbols/military-m.svg +++ b/data/styles/clear/style-night/symbols/military-m.svg @@ -1,14 +1,7 @@ - - - - military-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/military-s.svg b/data/styles/clear/style-night/symbols/military-s.svg index 4279545a29..1d7de7d35b 100644 --- a/data/styles/clear/style-night/symbols/military-s.svg +++ b/data/styles/clear/style-night/symbols/military-s.svg @@ -1,14 +1,7 @@ - - - - military-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/mobile_phone-l.svg b/data/styles/clear/style-night/symbols/mobile_phone-l.svg index bbaeceec3e..9047a9b2a3 100644 --- a/data/styles/clear/style-night/symbols/mobile_phone-l.svg +++ b/data/styles/clear/style-night/symbols/mobile_phone-l.svg @@ -1,20 +1,7 @@ - - - - mobile_phone-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/mobile_phone-m.svg b/data/styles/clear/style-night/symbols/mobile_phone-m.svg index 974613752c..9e44a159ee 100644 --- a/data/styles/clear/style-night/symbols/mobile_phone-m.svg +++ b/data/styles/clear/style-night/symbols/mobile_phone-m.svg @@ -1,20 +1,7 @@ - - - - mobile_phone-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/mobile_phone-s.svg b/data/styles/clear/style-night/symbols/mobile_phone-s.svg new file mode 100644 index 0000000000..ff2cfdc3f6 --- /dev/null +++ b/data/styles/clear/style-night/symbols/mobile_phone-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/monument-l.svg b/data/styles/clear/style-night/symbols/monument-l.svg index 967c7802f2..7422aeb08c 100644 --- a/data/styles/clear/style-night/symbols/monument-l.svg +++ b/data/styles/clear/style-night/symbols/monument-l.svg @@ -1,14 +1,7 @@ - - - - monument-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/monument-m.svg b/data/styles/clear/style-night/symbols/monument-m.svg index 996a06ac5c..3928a95874 100644 --- a/data/styles/clear/style-night/symbols/monument-m.svg +++ b/data/styles/clear/style-night/symbols/monument-m.svg @@ -1,14 +1,7 @@ - - - - monument-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/monument-s.svg b/data/styles/clear/style-night/symbols/monument-s.svg index cccfbf7bdd..a3aae6618f 100644 --- a/data/styles/clear/style-night/symbols/monument-s.svg +++ b/data/styles/clear/style-night/symbols/monument-s.svg @@ -1,14 +1,7 @@ - - - - monument-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/motel-l.svg b/data/styles/clear/style-night/symbols/motel-l.svg index e3fd3568c6..795d70d1e9 100644 --- a/data/styles/clear/style-night/symbols/motel-l.svg +++ b/data/styles/clear/style-night/symbols/motel-l.svg @@ -1,14 +1,7 @@ - - - - motel-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/motel-m.svg b/data/styles/clear/style-night/symbols/motel-m.svg index 66408b3d9e..d15ddef927 100644 --- a/data/styles/clear/style-night/symbols/motel-m.svg +++ b/data/styles/clear/style-night/symbols/motel-m.svg @@ -1,14 +1,7 @@ - - - - motel-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/motel-s.svg b/data/styles/clear/style-night/symbols/motel-s.svg index 4f5e6f5535..b227d3e3e2 100644 --- a/data/styles/clear/style-night/symbols/motel-s.svg +++ b/data/styles/clear/style-night/symbols/motel-s.svg @@ -1,14 +1,7 @@ - - - - motel-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/motorcycle_shop-l.svg b/data/styles/clear/style-night/symbols/motorcycle_shop-l.svg new file mode 100644 index 0000000000..1ff30e813a --- /dev/null +++ b/data/styles/clear/style-night/symbols/motorcycle_shop-l.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/motorcycle_shop-m.svg b/data/styles/clear/style-night/symbols/motorcycle_shop-m.svg new file mode 100644 index 0000000000..5394118f58 --- /dev/null +++ b/data/styles/clear/style-night/symbols/motorcycle_shop-m.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/motorcycle_shop-s.svg b/data/styles/clear/style-night/symbols/motorcycle_shop-s.svg new file mode 100644 index 0000000000..c5e3565b63 --- /dev/null +++ b/data/styles/clear/style-night/symbols/motorcycle_shop-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/museum-l.svg b/data/styles/clear/style-night/symbols/museum-l.svg index e785499595..4d1156f17d 100644 --- a/data/styles/clear/style-night/symbols/museum-l.svg +++ b/data/styles/clear/style-night/symbols/museum-l.svg @@ -1,14 +1,7 @@ - - - - museum-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/museum-m.svg b/data/styles/clear/style-night/symbols/museum-m.svg index 4f48a3c3ab..764ba916ca 100644 --- a/data/styles/clear/style-night/symbols/museum-m.svg +++ b/data/styles/clear/style-night/symbols/museum-m.svg @@ -1,14 +1,7 @@ - - - - museum-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/museum-s.svg b/data/styles/clear/style-night/symbols/museum-s.svg index 562d349302..b371cb704c 100644 --- a/data/styles/clear/style-night/symbols/museum-s.svg +++ b/data/styles/clear/style-night/symbols/museum-s.svg @@ -1,15 +1,7 @@ - - - - museum-s - Created with Sketch. - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/muslim-l.svg b/data/styles/clear/style-night/symbols/muslim-l.svg index d6d00e302f..ed7de88ad0 100644 --- a/data/styles/clear/style-night/symbols/muslim-l.svg +++ b/data/styles/clear/style-night/symbols/muslim-l.svg @@ -1,17 +1,7 @@ - - - - muslim-l - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/muslim-m.svg b/data/styles/clear/style-night/symbols/muslim-m.svg index 75831835f2..94bbda313b 100644 --- a/data/styles/clear/style-night/symbols/muslim-m.svg +++ b/data/styles/clear/style-night/symbols/muslim-m.svg @@ -1,18 +1,7 @@ - - - - muslim-m - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/muslim-s.svg b/data/styles/clear/style-night/symbols/muslim-s.svg index ebac7aa932..99f2fce94e 100644 --- a/data/styles/clear/style-night/symbols/muslim-s.svg +++ b/data/styles/clear/style-night/symbols/muslim-s.svg @@ -1,17 +1,7 @@ - - - - muslim-s - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/no-icon-amenity.svg b/data/styles/clear/style-night/symbols/no-icon-amenity.svg deleted file mode 100644 index 05023c5799..0000000000 --- a/data/styles/clear/style-night/symbols/no-icon-amenity.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - no-icon-amenity - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/no-icon-leisure.svg b/data/styles/clear/style-night/symbols/no-icon-leisure.svg deleted file mode 100644 index 88dda8dba5..0000000000 --- a/data/styles/clear/style-night/symbols/no-icon-leisure.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - no-icon-leisure - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/no-icon-shop.svg b/data/styles/clear/style-night/symbols/no-icon-shop.svg deleted file mode 100644 index d2dab38231..0000000000 --- a/data/styles/clear/style-night/symbols/no-icon-shop.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - no-icon-shop - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/no-icon-tourism.svg b/data/styles/clear/style-night/symbols/no-icon-tourism.svg deleted file mode 100644 index 16f0d7a612..0000000000 --- a/data/styles/clear/style-night/symbols/no-icon-tourism.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - no-icon-tourism - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/no-icon.svg b/data/styles/clear/style-night/symbols/no-icon.svg deleted file mode 100644 index a6e8f23c90..0000000000 --- a/data/styles/clear/style-night/symbols/no-icon.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - no-icon - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/none.svg b/data/styles/clear/style-night/symbols/none.svg deleted file mode 100644 index 07bf72d5f2..0000000000 --- a/data/styles/clear/style-night/symbols/none.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - none - Created with Sketch. - - - \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/npark-l.svg b/data/styles/clear/style-night/symbols/npark-l.svg index b6658b8674..2a3136af9c 100644 --- a/data/styles/clear/style-night/symbols/npark-l.svg +++ b/data/styles/clear/style-night/symbols/npark-l.svg @@ -1,14 +1,7 @@ - - - - npark-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/npark-m.svg b/data/styles/clear/style-night/symbols/npark-m.svg index 09367dbbb4..289f8721fa 100644 --- a/data/styles/clear/style-night/symbols/npark-m.svg +++ b/data/styles/clear/style-night/symbols/npark-m.svg @@ -1,16 +1,7 @@ - - - - npark-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/npark-s.svg b/data/styles/clear/style-night/symbols/npark-s.svg index d90e97bd2a..c63ed38a4f 100644 --- a/data/styles/clear/style-night/symbols/npark-s.svg +++ b/data/styles/clear/style-night/symbols/npark-s.svg @@ -1,16 +1,7 @@ - - - - npark-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/nparkF-l.svg b/data/styles/clear/style-night/symbols/nparkF-l.svg index 39db71122a..8fe0f2f88a 100644 --- a/data/styles/clear/style-night/symbols/nparkF-l.svg +++ b/data/styles/clear/style-night/symbols/nparkF-l.svg @@ -1,14 +1,7 @@ - - - - nparkF-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/nparkF-m.svg b/data/styles/clear/style-night/symbols/nparkF-m.svg index 5d9057d328..326219bba5 100644 --- a/data/styles/clear/style-night/symbols/nparkF-m.svg +++ b/data/styles/clear/style-night/symbols/nparkF-m.svg @@ -1,14 +1,7 @@ - - - - nparkF-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/nparkF-s.svg b/data/styles/clear/style-night/symbols/nparkF-s.svg index ea7492ff87..28878697ad 100644 --- a/data/styles/clear/style-night/symbols/nparkF-s.svg +++ b/data/styles/clear/style-night/symbols/nparkF-s.svg @@ -1,14 +1,7 @@ - - - - nparkF-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/office-l.svg b/data/styles/clear/style-night/symbols/office-l.svg index 70a4c7c2c6..1bf6a47546 100644 --- a/data/styles/clear/style-night/symbols/office-l.svg +++ b/data/styles/clear/style-night/symbols/office-l.svg @@ -1,14 +1,7 @@ - - - - office-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/office-m.svg b/data/styles/clear/style-night/symbols/office-m.svg index 396d5ff9da..3d942c2ab8 100644 --- a/data/styles/clear/style-night/symbols/office-m.svg +++ b/data/styles/clear/style-night/symbols/office-m.svg @@ -1,14 +1,7 @@ - - - - office-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/office-s.svg b/data/styles/clear/style-night/symbols/office-s.svg index 057d46478b..4e2f5104cb 100644 --- a/data/styles/clear/style-night/symbols/office-s.svg +++ b/data/styles/clear/style-night/symbols/office-s.svg @@ -1,14 +1,7 @@ - - - - office-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/optician-l.svg b/data/styles/clear/style-night/symbols/optician-l.svg index a077991d19..60e335d05d 100644 --- a/data/styles/clear/style-night/symbols/optician-l.svg +++ b/data/styles/clear/style-night/symbols/optician-l.svg @@ -1,20 +1,7 @@ - - - - optician-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/optician-m.svg b/data/styles/clear/style-night/symbols/optician-m.svg index a8fb6bf5d2..9602a61f66 100644 --- a/data/styles/clear/style-night/symbols/optician-m.svg +++ b/data/styles/clear/style-night/symbols/optician-m.svg @@ -1,20 +1,7 @@ - - - - optician-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/optician-s.svg b/data/styles/clear/style-night/symbols/optician-s.svg new file mode 100644 index 0000000000..825e1a5c6f --- /dev/null +++ b/data/styles/clear/style-night/symbols/optician-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/outdoor-shop-l.svg b/data/styles/clear/style-night/symbols/outdoor-shop-l.svg index 2617a5884a..db84979361 100644 --- a/data/styles/clear/style-night/symbols/outdoor-shop-l.svg +++ b/data/styles/clear/style-night/symbols/outdoor-shop-l.svg @@ -1,26 +1,7 @@ - - - - outdoor-shop-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/outdoor-shop-m.svg b/data/styles/clear/style-night/symbols/outdoor-shop-m.svg index 71d12917ad..cec4d2e559 100644 --- a/data/styles/clear/style-night/symbols/outdoor-shop-m.svg +++ b/data/styles/clear/style-night/symbols/outdoor-shop-m.svg @@ -1,20 +1,7 @@ - - - - outdoor-shop-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/outdoor-shop-s.svg b/data/styles/clear/style-night/symbols/outdoor-shop-s.svg new file mode 100644 index 0000000000..fa9f3137b2 --- /dev/null +++ b/data/styles/clear/style-night/symbols/outdoor-shop-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/park-l.svg b/data/styles/clear/style-night/symbols/park-l.svg index 5fcc42fcbf..dcb9b9d277 100644 --- a/data/styles/clear/style-night/symbols/park-l.svg +++ b/data/styles/clear/style-night/symbols/park-l.svg @@ -1,14 +1,7 @@ - - - - park-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/park-m.svg b/data/styles/clear/style-night/symbols/park-m.svg index e163091a03..aa785204ce 100644 --- a/data/styles/clear/style-night/symbols/park-m.svg +++ b/data/styles/clear/style-night/symbols/park-m.svg @@ -1,14 +1,7 @@ - - - - park-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/park-s.svg b/data/styles/clear/style-night/symbols/park-s.svg index 124839b9f7..1a42e2ec7c 100644 --- a/data/styles/clear/style-night/symbols/park-s.svg +++ b/data/styles/clear/style-night/symbols/park-s.svg @@ -1,14 +1,7 @@ - - - - park-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/parking-l.svg b/data/styles/clear/style-night/symbols/parking-l.svg index 3657df95b2..94de5cb885 100644 --- a/data/styles/clear/style-night/symbols/parking-l.svg +++ b/data/styles/clear/style-night/symbols/parking-l.svg @@ -1,14 +1,7 @@ - - - - parking-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/parking-m.svg b/data/styles/clear/style-night/symbols/parking-m.svg index de894b2ace..47afff6b51 100644 --- a/data/styles/clear/style-night/symbols/parking-m.svg +++ b/data/styles/clear/style-night/symbols/parking-m.svg @@ -1,14 +1,7 @@ - - - - parking-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/parking-meter-l.svg b/data/styles/clear/style-night/symbols/parking-meter-l.svg index b18f1814e4..4db22ac8a8 100644 --- a/data/styles/clear/style-night/symbols/parking-meter-l.svg +++ b/data/styles/clear/style-night/symbols/parking-meter-l.svg @@ -1,12 +1,6 @@ - - - - parking-meter-l - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/parking-meter-m.svg b/data/styles/clear/style-night/symbols/parking-meter-m.svg index 9f5653779e..864e8c6e93 100644 --- a/data/styles/clear/style-night/symbols/parking-meter-m.svg +++ b/data/styles/clear/style-night/symbols/parking-meter-m.svg @@ -1,12 +1,6 @@ - - - - parking-meter-m - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/parking-meter-s.svg b/data/styles/clear/style-night/symbols/parking-meter-s.svg new file mode 100644 index 0000000000..8164f8659e --- /dev/null +++ b/data/styles/clear/style-night/symbols/parking-meter-s.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/data/styles/clear/style-night/symbols/parking-s.svg b/data/styles/clear/style-night/symbols/parking-s.svg index 6491d7325e..0e1440128b 100644 --- a/data/styles/clear/style-night/symbols/parking-s.svg +++ b/data/styles/clear/style-night/symbols/parking-s.svg @@ -1,14 +1,7 @@ - - - - parking-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/parking_pay-l.svg b/data/styles/clear/style-night/symbols/parking_pay-l.svg new file mode 100644 index 0000000000..1805f8c2e9 --- /dev/null +++ b/data/styles/clear/style-night/symbols/parking_pay-l.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/parking_pay-m.svg b/data/styles/clear/style-night/symbols/parking_pay-m.svg new file mode 100644 index 0000000000..7e0f4ac66e --- /dev/null +++ b/data/styles/clear/style-night/symbols/parking_pay-m.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/parking_pay-s.svg b/data/styles/clear/style-night/symbols/parking_pay-s.svg new file mode 100644 index 0000000000..9fd4f619cc --- /dev/null +++ b/data/styles/clear/style-night/symbols/parking_pay-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/peakt-l.svg b/data/styles/clear/style-night/symbols/peakt-l.svg index 5742ea8202..9f9ec4e87c 100644 --- a/data/styles/clear/style-night/symbols/peakt-l.svg +++ b/data/styles/clear/style-night/symbols/peakt-l.svg @@ -1,10 +1,3 @@ - - - - peakt-l - Created with Sketch. - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-night/symbols/peakt-m.svg b/data/styles/clear/style-night/symbols/peakt-m.svg index 506f162e1c..dc3392172f 100644 --- a/data/styles/clear/style-night/symbols/peakt-m.svg +++ b/data/styles/clear/style-night/symbols/peakt-m.svg @@ -1,10 +1,3 @@ - - - - peakt-m - Created with Sketch. - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-night/symbols/peakt-s.svg b/data/styles/clear/style-night/symbols/peakt-s.svg index ec9300bff5..7d8b0c7d79 100644 --- a/data/styles/clear/style-night/symbols/peakt-s.svg +++ b/data/styles/clear/style-night/symbols/peakt-s.svg @@ -1,10 +1,3 @@ - - - - peakt-s - Created with Sketch. - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-night/symbols/petshop-l.svg b/data/styles/clear/style-night/symbols/petshop-l.svg index fdbb2f7839..5f1ad321ea 100644 --- a/data/styles/clear/style-night/symbols/petshop-l.svg +++ b/data/styles/clear/style-night/symbols/petshop-l.svg @@ -1,26 +1,7 @@ - - - - petshop-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/petshop-m.svg b/data/styles/clear/style-night/symbols/petshop-m.svg index 42704d171b..35097039b1 100644 --- a/data/styles/clear/style-night/symbols/petshop-m.svg +++ b/data/styles/clear/style-night/symbols/petshop-m.svg @@ -1,20 +1,7 @@ - - - - petshop-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/petshop-s.svg b/data/styles/clear/style-night/symbols/petshop-s.svg new file mode 100644 index 0000000000..950360a9a3 --- /dev/null +++ b/data/styles/clear/style-night/symbols/petshop-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/pharmacy-l.svg b/data/styles/clear/style-night/symbols/pharmacy-l.svg index 8edcb7b474..af4f88f635 100644 --- a/data/styles/clear/style-night/symbols/pharmacy-l.svg +++ b/data/styles/clear/style-night/symbols/pharmacy-l.svg @@ -1,16 +1,7 @@ - - - - pharmacy-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/pharmacy-m.svg b/data/styles/clear/style-night/symbols/pharmacy-m.svg index d08e8c861e..e7c80e5cfc 100644 --- a/data/styles/clear/style-night/symbols/pharmacy-m.svg +++ b/data/styles/clear/style-night/symbols/pharmacy-m.svg @@ -1,16 +1,7 @@ - - - - pharmacy-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/pharmacy-s.svg b/data/styles/clear/style-night/symbols/pharmacy-s.svg index 898654442d..5349d7c581 100644 --- a/data/styles/clear/style-night/symbols/pharmacy-s.svg +++ b/data/styles/clear/style-night/symbols/pharmacy-s.svg @@ -1,16 +1,7 @@ - - - - pharmacy-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/phone-l.svg b/data/styles/clear/style-night/symbols/phone-l.svg index b274b63542..1fe61fd13e 100644 --- a/data/styles/clear/style-night/symbols/phone-l.svg +++ b/data/styles/clear/style-night/symbols/phone-l.svg @@ -1,12 +1,6 @@ - - - - phone-l - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/phone-m.svg b/data/styles/clear/style-night/symbols/phone-m.svg index 5522040f0f..38d7c5e8a4 100644 --- a/data/styles/clear/style-night/symbols/phone-m.svg +++ b/data/styles/clear/style-night/symbols/phone-m.svg @@ -1,12 +1,6 @@ - - - - phone-m - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/phone-s.svg b/data/styles/clear/style-night/symbols/phone-s.svg index 8b63379c21..c8131a1b80 100644 --- a/data/styles/clear/style-night/symbols/phone-s.svg +++ b/data/styles/clear/style-night/symbols/phone-s.svg @@ -1,12 +1,6 @@ - - - - phone-s - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/photo-shop-l.svg b/data/styles/clear/style-night/symbols/photo-shop-l.svg index c5d5333913..cfb7d80db2 100644 --- a/data/styles/clear/style-night/symbols/photo-shop-l.svg +++ b/data/styles/clear/style-night/symbols/photo-shop-l.svg @@ -1,28 +1,7 @@ - - - - photo-shop-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/photo-shop-m.svg b/data/styles/clear/style-night/symbols/photo-shop-m.svg index 00b4055262..9844d797d1 100644 --- a/data/styles/clear/style-night/symbols/photo-shop-m.svg +++ b/data/styles/clear/style-night/symbols/photo-shop-m.svg @@ -1,26 +1,7 @@ - - - - photo-shop-m - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/photo-shop-s.svg b/data/styles/clear/style-night/symbols/photo-shop-s.svg new file mode 100644 index 0000000000..4ce1f2cf82 --- /dev/null +++ b/data/styles/clear/style-night/symbols/photo-shop-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/picnic-l.svg b/data/styles/clear/style-night/symbols/picnic-l.svg index 223ab4156f..31b9608b27 100644 --- a/data/styles/clear/style-night/symbols/picnic-l.svg +++ b/data/styles/clear/style-night/symbols/picnic-l.svg @@ -1,14 +1,7 @@ - - - - picnic-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/picnic-m.svg b/data/styles/clear/style-night/symbols/picnic-m.svg index 9b40a631bf..87da928e2e 100644 --- a/data/styles/clear/style-night/symbols/picnic-m.svg +++ b/data/styles/clear/style-night/symbols/picnic-m.svg @@ -1,14 +1,7 @@ - - - - picnic-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/picnic-s.svg b/data/styles/clear/style-night/symbols/picnic-s.svg index 4c34169494..484a6130c7 100644 --- a/data/styles/clear/style-night/symbols/picnic-s.svg +++ b/data/styles/clear/style-night/symbols/picnic-s.svg @@ -1,14 +1,7 @@ - - - - picnic-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/pitch-l.svg b/data/styles/clear/style-night/symbols/pitch-l.svg index 0c82aae3ce..b246f8bb8b 100644 --- a/data/styles/clear/style-night/symbols/pitch-l.svg +++ b/data/styles/clear/style-night/symbols/pitch-l.svg @@ -1,14 +1,7 @@ - - - - pitch-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/pitch-m.svg b/data/styles/clear/style-night/symbols/pitch-m.svg index efd8aaa01f..b8f058459a 100644 --- a/data/styles/clear/style-night/symbols/pitch-m.svg +++ b/data/styles/clear/style-night/symbols/pitch-m.svg @@ -1,14 +1,7 @@ - - - - pitch-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/pitch-s.svg b/data/styles/clear/style-night/symbols/pitch-s.svg index d128443c0b..4f33db51f5 100644 --- a/data/styles/clear/style-night/symbols/pitch-s.svg +++ b/data/styles/clear/style-night/symbols/pitch-s.svg @@ -1,14 +1,7 @@ - - - - pitch-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/place-of-worship-l.svg b/data/styles/clear/style-night/symbols/place-of-worship-l.svg index 940022b7d6..d2a8918d4c 100644 --- a/data/styles/clear/style-night/symbols/place-of-worship-l.svg +++ b/data/styles/clear/style-night/symbols/place-of-worship-l.svg @@ -1,16 +1,7 @@ - - - - place-of-worship-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/place-of-worship-m.svg b/data/styles/clear/style-night/symbols/place-of-worship-m.svg index 5fbd0f92ca..8ec9b9ca9c 100644 --- a/data/styles/clear/style-night/symbols/place-of-worship-m.svg +++ b/data/styles/clear/style-night/symbols/place-of-worship-m.svg @@ -1,16 +1,7 @@ - - - - place-of-worship-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/place-of-worship-s.svg b/data/styles/clear/style-night/symbols/place-of-worship-s.svg index e9c5d56a9c..86b19db3db 100644 --- a/data/styles/clear/style-night/symbols/place-of-worship-s.svg +++ b/data/styles/clear/style-night/symbols/place-of-worship-s.svg @@ -1,16 +1,7 @@ - - - - place-of-worship-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/police-l.svg b/data/styles/clear/style-night/symbols/police-l.svg index 5fffc54704..b65bd1a6d5 100644 --- a/data/styles/clear/style-night/symbols/police-l.svg +++ b/data/styles/clear/style-night/symbols/police-l.svg @@ -1,14 +1,7 @@ - - - - police-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/police-m.svg b/data/styles/clear/style-night/symbols/police-m.svg index 45c9a70a60..9412e49249 100644 --- a/data/styles/clear/style-night/symbols/police-m.svg +++ b/data/styles/clear/style-night/symbols/police-m.svg @@ -1,18 +1,7 @@ - - - - police-m - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/police-s.svg b/data/styles/clear/style-night/symbols/police-s.svg index 4182bb9b36..6c5384aa3a 100644 --- a/data/styles/clear/style-night/symbols/police-s.svg +++ b/data/styles/clear/style-night/symbols/police-s.svg @@ -1,14 +1,7 @@ - - - - police-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/postbox-l.svg b/data/styles/clear/style-night/symbols/postbox-l.svg index 14caed5bd5..86ffef1e12 100644 --- a/data/styles/clear/style-night/symbols/postbox-l.svg +++ b/data/styles/clear/style-night/symbols/postbox-l.svg @@ -1,12 +1,6 @@ - - - - postbox-l - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/postbox-m.svg b/data/styles/clear/style-night/symbols/postbox-m.svg index d95289735c..4adca485bf 100644 --- a/data/styles/clear/style-night/symbols/postbox-m.svg +++ b/data/styles/clear/style-night/symbols/postbox-m.svg @@ -1,12 +1,6 @@ - - - - postbox-m - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/postbox-s.svg b/data/styles/clear/style-night/symbols/postbox-s.svg new file mode 100644 index 0000000000..ee3623966a --- /dev/null +++ b/data/styles/clear/style-night/symbols/postbox-s.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/data/styles/clear/style-night/symbols/power-l.svg b/data/styles/clear/style-night/symbols/power-l.svg index e3d9680b1d..fc06b6d92e 100644 --- a/data/styles/clear/style-night/symbols/power-l.svg +++ b/data/styles/clear/style-night/symbols/power-l.svg @@ -1,14 +1,7 @@ - - - - power-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/power-m.svg b/data/styles/clear/style-night/symbols/power-m.svg index 1edf6f1bf2..858118e84e 100644 --- a/data/styles/clear/style-night/symbols/power-m.svg +++ b/data/styles/clear/style-night/symbols/power-m.svg @@ -1,14 +1,7 @@ - - - - power-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/power-s.svg b/data/styles/clear/style-night/symbols/power-s.svg new file mode 100644 index 0000000000..f2e9661712 --- /dev/null +++ b/data/styles/clear/style-night/symbols/power-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/public-building-l.svg b/data/styles/clear/style-night/symbols/public-building-l.svg index 985a5590bf..06938a76b6 100644 --- a/data/styles/clear/style-night/symbols/public-building-l.svg +++ b/data/styles/clear/style-night/symbols/public-building-l.svg @@ -1,14 +1,7 @@ - - - - public-building-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/public-building-m.svg b/data/styles/clear/style-night/symbols/public-building-m.svg index 7a0de9f19e..56217468b3 100644 --- a/data/styles/clear/style-night/symbols/public-building-m.svg +++ b/data/styles/clear/style-night/symbols/public-building-m.svg @@ -1,14 +1,7 @@ - - - - public-building-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/public-building-s.svg b/data/styles/clear/style-night/symbols/public-building-s.svg index e03b7311d7..6eadae95f5 100644 --- a/data/styles/clear/style-night/symbols/public-building-s.svg +++ b/data/styles/clear/style-night/symbols/public-building-s.svg @@ -1,14 +1,7 @@ - - - - public-building-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/railway-crossing-l.svg b/data/styles/clear/style-night/symbols/railway-crossing-l.svg new file mode 100644 index 0000000000..fb24e8ea0e --- /dev/null +++ b/data/styles/clear/style-night/symbols/railway-crossing-l.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/railway-crossing_xl.svg b/data/styles/clear/style-night/symbols/railway-crossing-xl.svg similarity index 100% rename from data/styles/clear/style-night/symbols/railway-crossing_xl.svg rename to data/styles/clear/style-night/symbols/railway-crossing-xl.svg diff --git a/data/styles/clear/style-night/symbols/railway-crossing.svg b/data/styles/clear/style-night/symbols/railway-crossing.svg index b3e3bd9630..2bc7f4b978 100644 --- a/data/styles/clear/style-night/symbols/railway-crossing.svg +++ b/data/styles/clear/style-night/symbols/railway-crossing.svg @@ -1,18 +1,10 @@ - - - - railway-crossing - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/railway-crossing_l.svg b/data/styles/clear/style-night/symbols/railway-crossing_l.svg deleted file mode 100644 index bf613f3f90..0000000000 --- a/data/styles/clear/style-night/symbols/railway-crossing_l.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - -railway-crossing -Created with Sketch. - - - - - - - - diff --git a/data/styles/clear/style-night/symbols/recycling-l.svg b/data/styles/clear/style-night/symbols/recycling-l.svg index 30e32094bc..d1f2f6eb9b 100644 --- a/data/styles/clear/style-night/symbols/recycling-l.svg +++ b/data/styles/clear/style-night/symbols/recycling-l.svg @@ -1,12 +1,6 @@ - - - - recycling-l - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/recycling-m.svg b/data/styles/clear/style-night/symbols/recycling-m.svg index 46ca231d96..fe883f3558 100644 --- a/data/styles/clear/style-night/symbols/recycling-m.svg +++ b/data/styles/clear/style-night/symbols/recycling-m.svg @@ -1,12 +1,6 @@ - - - - recycling-m - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/recycling-s.svg b/data/styles/clear/style-night/symbols/recycling-s.svg index e035d228a9..1782325500 100644 --- a/data/styles/clear/style-night/symbols/recycling-s.svg +++ b/data/styles/clear/style-night/symbols/recycling-s.svg @@ -1,12 +1,6 @@ - - - - recycling-s - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/remains-l.svg b/data/styles/clear/style-night/symbols/remains-l.svg index 8925b4adad..817f861ae3 100644 --- a/data/styles/clear/style-night/symbols/remains-l.svg +++ b/data/styles/clear/style-night/symbols/remains-l.svg @@ -1,18 +1,7 @@ - - - - remains-l - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/remains-m.svg b/data/styles/clear/style-night/symbols/remains-m.svg index 3e87dc0dc4..ae75311ebb 100644 --- a/data/styles/clear/style-night/symbols/remains-m.svg +++ b/data/styles/clear/style-night/symbols/remains-m.svg @@ -1,14 +1,7 @@ - - - - remains-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/remains-s.svg b/data/styles/clear/style-night/symbols/remains-s.svg index 33f7c89824..1302906176 100644 --- a/data/styles/clear/style-night/symbols/remains-s.svg +++ b/data/styles/clear/style-night/symbols/remains-s.svg @@ -1,18 +1,7 @@ - - - - remains-s - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/restaurant-l.svg b/data/styles/clear/style-night/symbols/restaurant-l.svg index a8a7a769a1..16b9984d3a 100644 --- a/data/styles/clear/style-night/symbols/restaurant-l.svg +++ b/data/styles/clear/style-night/symbols/restaurant-l.svg @@ -1,16 +1,7 @@ - - - - restaurant-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/restaurant-m.svg b/data/styles/clear/style-night/symbols/restaurant-m.svg index 58f560ce42..f96af97095 100644 --- a/data/styles/clear/style-night/symbols/restaurant-m.svg +++ b/data/styles/clear/style-night/symbols/restaurant-m.svg @@ -1,16 +1,7 @@ - - - - restaurant-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/restaurant-s.svg b/data/styles/clear/style-night/symbols/restaurant-s.svg index 6623a2b2b9..10040133b5 100644 --- a/data/styles/clear/style-night/symbols/restaurant-s.svg +++ b/data/styles/clear/style-night/symbols/restaurant-s.svg @@ -1,16 +1,7 @@ - - - - restaurant-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/s-arrow.svg b/data/styles/clear/style-night/symbols/s-arrow.svg deleted file mode 100644 index 6b44995dbe..0000000000 --- a/data/styles/clear/style-night/symbols/s-arrow.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - s-arrow - Created with Sketch. - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/sauna-l.svg b/data/styles/clear/style-night/symbols/sauna-l.svg index 8db612685f..f5a8eff4eb 100644 --- a/data/styles/clear/style-night/symbols/sauna-l.svg +++ b/data/styles/clear/style-night/symbols/sauna-l.svg @@ -1,20 +1,7 @@ - - - - sauna-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/sauna-m.svg b/data/styles/clear/style-night/symbols/sauna-m.svg index 9abdf7303b..218126ab04 100644 --- a/data/styles/clear/style-night/symbols/sauna-m.svg +++ b/data/styles/clear/style-night/symbols/sauna-m.svg @@ -1,14 +1,7 @@ - - - - sauna-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/sauna-s.svg b/data/styles/clear/style-night/symbols/sauna-s.svg new file mode 100644 index 0000000000..845b918247 --- /dev/null +++ b/data/styles/clear/style-night/symbols/sauna-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/school-l.svg b/data/styles/clear/style-night/symbols/school-l.svg index 85af430ec1..b72b93ce06 100644 --- a/data/styles/clear/style-night/symbols/school-l.svg +++ b/data/styles/clear/style-night/symbols/school-l.svg @@ -1,14 +1,7 @@ - - - - school-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/school-m.svg b/data/styles/clear/style-night/symbols/school-m.svg index d5b071a15d..c01fded6ec 100644 --- a/data/styles/clear/style-night/symbols/school-m.svg +++ b/data/styles/clear/style-night/symbols/school-m.svg @@ -1,14 +1,7 @@ - - - - school-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/school-s.svg b/data/styles/clear/style-night/symbols/school-s.svg index 355310a006..0fdc73d38a 100644 --- a/data/styles/clear/style-night/symbols/school-s.svg +++ b/data/styles/clear/style-night/symbols/school-s.svg @@ -1,14 +1,7 @@ - - - - school-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/seafood-shop-l.svg b/data/styles/clear/style-night/symbols/seafood-shop-l.svg index b9915e9bcb..69028f6df3 100644 --- a/data/styles/clear/style-night/symbols/seafood-shop-l.svg +++ b/data/styles/clear/style-night/symbols/seafood-shop-l.svg @@ -1,26 +1,7 @@ - - - - seafood-shop-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/seafood-shop-m.svg b/data/styles/clear/style-night/symbols/seafood-shop-m.svg index 56000db549..a6468e5133 100644 --- a/data/styles/clear/style-night/symbols/seafood-shop-m.svg +++ b/data/styles/clear/style-night/symbols/seafood-shop-m.svg @@ -1,26 +1,7 @@ - - - - seafood-shop-m - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/seafood-shop-s.svg b/data/styles/clear/style-night/symbols/seafood-shop-s.svg new file mode 100644 index 0000000000..6411b037e2 --- /dev/null +++ b/data/styles/clear/style-night/symbols/seafood-shop-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/shinto-l.svg b/data/styles/clear/style-night/symbols/shinto-l.svg index c313124abd..a8d0ef1416 100644 --- a/data/styles/clear/style-night/symbols/shinto-l.svg +++ b/data/styles/clear/style-night/symbols/shinto-l.svg @@ -1,16 +1,7 @@ - - - - shinto-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/shinto-m.svg b/data/styles/clear/style-night/symbols/shinto-m.svg index edf404baf4..cb293ccb66 100644 --- a/data/styles/clear/style-night/symbols/shinto-m.svg +++ b/data/styles/clear/style-night/symbols/shinto-m.svg @@ -1,16 +1,7 @@ - - - - shinto-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/shinto-s.svg b/data/styles/clear/style-night/symbols/shinto-s.svg index 2388c28b3b..b7bdc13d53 100644 --- a/data/styles/clear/style-night/symbols/shinto-s.svg +++ b/data/styles/clear/style-night/symbols/shinto-s.svg @@ -1,16 +1,7 @@ - - - - shinto-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/ship-l.svg b/data/styles/clear/style-night/symbols/ship-l.svg index 0d983b7a4e..43713272e4 100644 --- a/data/styles/clear/style-night/symbols/ship-l.svg +++ b/data/styles/clear/style-night/symbols/ship-l.svg @@ -1,18 +1,7 @@ - - - - ship-l - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/ship-m.svg b/data/styles/clear/style-night/symbols/ship-m.svg index 71221defac..2c6ea59e45 100644 --- a/data/styles/clear/style-night/symbols/ship-m.svg +++ b/data/styles/clear/style-night/symbols/ship-m.svg @@ -1,18 +1,7 @@ - - - - ship-m - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/ship-s.svg b/data/styles/clear/style-night/symbols/ship-s.svg index 0ae37c0993..40f304c6fc 100644 --- a/data/styles/clear/style-night/symbols/ship-s.svg +++ b/data/styles/clear/style-night/symbols/ship-s.svg @@ -1,18 +1,7 @@ - - - - ship-s - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/shoes-l.svg b/data/styles/clear/style-night/symbols/shoes-l.svg index 9d69e9429e..b69b7a8d91 100644 --- a/data/styles/clear/style-night/symbols/shoes-l.svg +++ b/data/styles/clear/style-night/symbols/shoes-l.svg @@ -1,20 +1,7 @@ - - - - shoes-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/shoes-m.svg b/data/styles/clear/style-night/symbols/shoes-m.svg index e3f830045d..63e2afc8e5 100644 --- a/data/styles/clear/style-night/symbols/shoes-m.svg +++ b/data/styles/clear/style-night/symbols/shoes-m.svg @@ -1,20 +1,7 @@ - - - - shoes-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/shoes-s.svg b/data/styles/clear/style-night/symbols/shoes-s.svg new file mode 100644 index 0000000000..c8b2acb43a --- /dev/null +++ b/data/styles/clear/style-night/symbols/shoes-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/shop-bicycle-l.svg b/data/styles/clear/style-night/symbols/shop-bicycle-l.svg index 0f42757c60..9e2f1b3544 100644 --- a/data/styles/clear/style-night/symbols/shop-bicycle-l.svg +++ b/data/styles/clear/style-night/symbols/shop-bicycle-l.svg @@ -1,20 +1,7 @@ - - - - shop-bicycle-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/shop-bicycle-m.svg b/data/styles/clear/style-night/symbols/shop-bicycle-m.svg index a592bbf8d7..5bcb09c633 100644 --- a/data/styles/clear/style-night/symbols/shop-bicycle-m.svg +++ b/data/styles/clear/style-night/symbols/shop-bicycle-m.svg @@ -1,20 +1,7 @@ - - - - shop-bicycle-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/shop-bicycle-s.svg b/data/styles/clear/style-night/symbols/shop-bicycle-s.svg new file mode 100644 index 0000000000..cc62f6063c --- /dev/null +++ b/data/styles/clear/style-night/symbols/shop-bicycle-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/shop-l.svg b/data/styles/clear/style-night/symbols/shop-l.svg index 301acbd043..6fffc41973 100644 --- a/data/styles/clear/style-night/symbols/shop-l.svg +++ b/data/styles/clear/style-night/symbols/shop-l.svg @@ -1,20 +1,7 @@ - - - - shop-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/shop-m.svg b/data/styles/clear/style-night/symbols/shop-m.svg index dcfd7d87f5..30ecdac5e7 100644 --- a/data/styles/clear/style-night/symbols/shop-m.svg +++ b/data/styles/clear/style-night/symbols/shop-m.svg @@ -1,20 +1,7 @@ - - - - shop-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/shop-s.svg b/data/styles/clear/style-night/symbols/shop-s.svg index 1bd5f2ba36..2e9f760a27 100644 --- a/data/styles/clear/style-night/symbols/shop-s.svg +++ b/data/styles/clear/style-night/symbols/shop-s.svg @@ -1,20 +1,7 @@ - - - - shop-s - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/skiing-l.svg b/data/styles/clear/style-night/symbols/skiing-l.svg index 7b83f6d724..59f6d54f1d 100644 --- a/data/styles/clear/style-night/symbols/skiing-l.svg +++ b/data/styles/clear/style-night/symbols/skiing-l.svg @@ -1,14 +1,7 @@ - - - - skiing-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/skiing-m.svg b/data/styles/clear/style-night/symbols/skiing-m.svg index 2abe587ac0..25a461fdf9 100644 --- a/data/styles/clear/style-night/symbols/skiing-m.svg +++ b/data/styles/clear/style-night/symbols/skiing-m.svg @@ -1,14 +1,7 @@ - - - - skiing-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/skiing-s.svg b/data/styles/clear/style-night/symbols/skiing-s.svg index c1f136169d..1d6b02b144 100644 --- a/data/styles/clear/style-night/symbols/skiing-s.svg +++ b/data/styles/clear/style-night/symbols/skiing-s.svg @@ -1,14 +1,7 @@ - - - - skiing-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/soccer-l.svg b/data/styles/clear/style-night/symbols/soccer-l.svg index 27f14ade12..20125a302d 100644 --- a/data/styles/clear/style-night/symbols/soccer-l.svg +++ b/data/styles/clear/style-night/symbols/soccer-l.svg @@ -1,14 +1,7 @@ - - - - soccer-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/soccer-m.svg b/data/styles/clear/style-night/symbols/soccer-m.svg index 5c412aa658..14ab5a7421 100644 --- a/data/styles/clear/style-night/symbols/soccer-m.svg +++ b/data/styles/clear/style-night/symbols/soccer-m.svg @@ -1,14 +1,7 @@ - - - - soccer-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/soccer-s.svg b/data/styles/clear/style-night/symbols/soccer-s.svg index 301cfb6fb5..f44f41eb9a 100644 --- a/data/styles/clear/style-night/symbols/soccer-s.svg +++ b/data/styles/clear/style-night/symbols/soccer-s.svg @@ -1,14 +1,7 @@ - - - - soccer-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/speedcam-l.svg b/data/styles/clear/style-night/symbols/speedcam-l.svg index 26dd3c4afd..7412ed003f 100644 --- a/data/styles/clear/style-night/symbols/speedcam-l.svg +++ b/data/styles/clear/style-night/symbols/speedcam-l.svg @@ -1,15 +1,7 @@ - - - -speedcam-l -Created with Sketch. - - - - - + + + + + + diff --git a/data/styles/clear/style-night/symbols/speedcam-m.svg b/data/styles/clear/style-night/symbols/speedcam-m.svg index 8637017176..e0ff517e65 100644 --- a/data/styles/clear/style-night/symbols/speedcam-m.svg +++ b/data/styles/clear/style-night/symbols/speedcam-m.svg @@ -1,14 +1,7 @@ - - - - speedcam-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/speedcam-s.svg b/data/styles/clear/style-night/symbols/speedcam-s.svg index 7084b029c7..ea8f20497d 100644 --- a/data/styles/clear/style-night/symbols/speedcam-s.svg +++ b/data/styles/clear/style-night/symbols/speedcam-s.svg @@ -1,20 +1,7 @@ - - - - speedcam-s - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/speedcam1-l.svg b/data/styles/clear/style-night/symbols/speedcam1-l.svg deleted file mode 100644 index 50858220bc..0000000000 --- a/data/styles/clear/style-night/symbols/speedcam1-l.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - -speedcam-l -Created with Sketch. - - - - - - - - - - - diff --git a/data/styles/clear/style-night/symbols/speedcam1-m.svg b/data/styles/clear/style-night/symbols/speedcam1-m.svg deleted file mode 100644 index 5201afb574..0000000000 --- a/data/styles/clear/style-night/symbols/speedcam1-m.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - -speedcam-l -Created with Sketch. - - - - - - - - - diff --git a/data/styles/clear/style-night/symbols/sports-l.svg b/data/styles/clear/style-night/symbols/sports-l.svg index a9ee12135b..fd87a421a1 100644 --- a/data/styles/clear/style-night/symbols/sports-l.svg +++ b/data/styles/clear/style-night/symbols/sports-l.svg @@ -1,20 +1,7 @@ - - - - sports-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/sports-m.svg b/data/styles/clear/style-night/symbols/sports-m.svg index ec63cecabd..69d2114881 100644 --- a/data/styles/clear/style-night/symbols/sports-m.svg +++ b/data/styles/clear/style-night/symbols/sports-m.svg @@ -1,20 +1,7 @@ - - - - sports-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/sports-s.svg b/data/styles/clear/style-night/symbols/sports-s.svg new file mode 100644 index 0000000000..00737820f5 --- /dev/null +++ b/data/styles/clear/style-night/symbols/sports-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/stadium-l.svg b/data/styles/clear/style-night/symbols/stadium-l.svg index 773b719ede..0b3383db92 100644 --- a/data/styles/clear/style-night/symbols/stadium-l.svg +++ b/data/styles/clear/style-night/symbols/stadium-l.svg @@ -1,16 +1,7 @@ - - - - stadium-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/stadium-m.svg b/data/styles/clear/style-night/symbols/stadium-m.svg index 4582768f29..70f236d2fa 100644 --- a/data/styles/clear/style-night/symbols/stadium-m.svg +++ b/data/styles/clear/style-night/symbols/stadium-m.svg @@ -1,16 +1,7 @@ - - - - stadium-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/stadium-s.svg b/data/styles/clear/style-night/symbols/stadium-s.svg index 68896b9fad..569d40c0cb 100644 --- a/data/styles/clear/style-night/symbols/stadium-s.svg +++ b/data/styles/clear/style-night/symbols/stadium-s.svg @@ -1,16 +1,7 @@ - - - - stadium-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/star-l.svg b/data/styles/clear/style-night/symbols/star-l.svg index c4c55a01c1..b7c6caa6fe 100644 --- a/data/styles/clear/style-night/symbols/star-l.svg +++ b/data/styles/clear/style-night/symbols/star-l.svg @@ -1,25 +1,6 @@ - - - - star-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/star-m.svg b/data/styles/clear/style-night/symbols/star-m.svg index 081d547810..8f31be5948 100644 --- a/data/styles/clear/style-night/symbols/star-m.svg +++ b/data/styles/clear/style-night/symbols/star-m.svg @@ -1,19 +1,6 @@ - - - - star-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/star-s.svg b/data/styles/clear/style-night/symbols/star-s.svg index 68e92784c5..363d7f7eb0 100644 --- a/data/styles/clear/style-night/symbols/star-s.svg +++ b/data/styles/clear/style-night/symbols/star-s.svg @@ -1,19 +1,6 @@ - - - - star-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-barcelona-l.svg b/data/styles/clear/style-night/symbols/subway-barcelona-l.svg index 6c18d33475..d115e1f690 100644 --- a/data/styles/clear/style-night/symbols/subway-barcelona-l.svg +++ b/data/styles/clear/style-night/symbols/subway-barcelona-l.svg @@ -1,19 +1,7 @@ - - - - subway-barcelona-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-barcelona-m.svg b/data/styles/clear/style-night/symbols/subway-barcelona-m.svg index b2771e3b4f..4b6de46aeb 100644 --- a/data/styles/clear/style-night/symbols/subway-barcelona-m.svg +++ b/data/styles/clear/style-night/symbols/subway-barcelona-m.svg @@ -1,19 +1,7 @@ - - - - subway-barcelona-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-barcelona-s.svg b/data/styles/clear/style-night/symbols/subway-barcelona-s.svg index d50de795c3..3c0256cb1a 100644 --- a/data/styles/clear/style-night/symbols/subway-barcelona-s.svg +++ b/data/styles/clear/style-night/symbols/subway-barcelona-s.svg @@ -1,19 +1,7 @@ - - - - subway-barcelona-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-berlin-l.svg b/data/styles/clear/style-night/symbols/subway-berlin-l.svg index 54afbdde31..da4359d59d 100644 --- a/data/styles/clear/style-night/symbols/subway-berlin-l.svg +++ b/data/styles/clear/style-night/symbols/subway-berlin-l.svg @@ -1,19 +1,7 @@ - - - - subway-berlin-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-berlin-m.svg b/data/styles/clear/style-night/symbols/subway-berlin-m.svg index 1f564a4d9b..416fcda67f 100644 --- a/data/styles/clear/style-night/symbols/subway-berlin-m.svg +++ b/data/styles/clear/style-night/symbols/subway-berlin-m.svg @@ -1,19 +1,7 @@ - - - - subway-berlin-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-berlin-s.svg b/data/styles/clear/style-night/symbols/subway-berlin-s.svg index 02a4c0ec33..cb3c43cae7 100644 --- a/data/styles/clear/style-night/symbols/subway-berlin-s.svg +++ b/data/styles/clear/style-night/symbols/subway-berlin-s.svg @@ -1,19 +1,7 @@ - - - - subway-berlin-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-entrance-2-m.svg b/data/styles/clear/style-night/symbols/subway-entrance-2-m.svg deleted file mode 100644 index 93d63372cf..0000000000 --- a/data/styles/clear/style-night/symbols/subway-entrance-2-m.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - subway-entrance-2-m - Created with Sketch. - - - - - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/subway-entrance-2-s.svg b/data/styles/clear/style-night/symbols/subway-entrance-2-s.svg deleted file mode 100644 index 4ff2f8c774..0000000000 --- a/data/styles/clear/style-night/symbols/subway-entrance-2-s.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - subway-entrance-2-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/subway-entrance-arrow.svg b/data/styles/clear/style-night/symbols/subway-entrance-arrow.svg deleted file mode 100644 index 055ab23647..0000000000 --- a/data/styles/clear/style-night/symbols/subway-entrance-arrow.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - subway-entrance-arrow - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/subway-entrance-l.svg b/data/styles/clear/style-night/symbols/subway-entrance-l.svg index 4c4d95d226..bc57ef9e6b 100644 --- a/data/styles/clear/style-night/symbols/subway-entrance-l.svg +++ b/data/styles/clear/style-night/symbols/subway-entrance-l.svg @@ -1,14 +1,7 @@ - - - - subway-entrance-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-entrance-m.svg b/data/styles/clear/style-night/symbols/subway-entrance-m.svg index c6994e77db..d517e7e1bc 100644 --- a/data/styles/clear/style-night/symbols/subway-entrance-m.svg +++ b/data/styles/clear/style-night/symbols/subway-entrance-m.svg @@ -1,16 +1,7 @@ - - - - subway-entrance-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-entrance-s.svg b/data/styles/clear/style-night/symbols/subway-entrance-s.svg index 64e778b5b1..d6d52ff157 100644 --- a/data/styles/clear/style-night/symbols/subway-entrance-s.svg +++ b/data/styles/clear/style-night/symbols/subway-entrance-s.svg @@ -1,18 +1,7 @@ - - - - subway-entrance-s - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-kiev-l.svg b/data/styles/clear/style-night/symbols/subway-kiev-l.svg index 82a633d84b..7a35cdf701 100644 --- a/data/styles/clear/style-night/symbols/subway-kiev-l.svg +++ b/data/styles/clear/style-night/symbols/subway-kiev-l.svg @@ -1,18 +1,6 @@ - - - - subway-kiev-l - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-kiev-m.svg b/data/styles/clear/style-night/symbols/subway-kiev-m.svg index 25631a683c..7a35cdf701 100644 --- a/data/styles/clear/style-night/symbols/subway-kiev-m.svg +++ b/data/styles/clear/style-night/symbols/subway-kiev-m.svg @@ -1,18 +1,6 @@ - - - - subway-kiev-m - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-kiev-s.svg b/data/styles/clear/style-night/symbols/subway-kiev-s.svg index e27fba10a2..adb297e026 100644 --- a/data/styles/clear/style-night/symbols/subway-kiev-s.svg +++ b/data/styles/clear/style-night/symbols/subway-kiev-s.svg @@ -1,18 +1,6 @@ - - - - subway-kiev-s - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-l.svg b/data/styles/clear/style-night/symbols/subway-l.svg index db8e0fd77e..0d2c4f24cf 100644 --- a/data/styles/clear/style-night/symbols/subway-l.svg +++ b/data/styles/clear/style-night/symbols/subway-l.svg @@ -1,20 +1,7 @@ - - - - subway-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-london-l.svg b/data/styles/clear/style-night/symbols/subway-london-l.svg index 946ca0e442..eef07caa9c 100644 --- a/data/styles/clear/style-night/symbols/subway-london-l.svg +++ b/data/styles/clear/style-night/symbols/subway-london-l.svg @@ -1,23 +1,8 @@ - - - - subway-london-l - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-london-m.svg b/data/styles/clear/style-night/symbols/subway-london-m.svg index f130efcccf..73753d4cbf 100644 --- a/data/styles/clear/style-night/symbols/subway-london-m.svg +++ b/data/styles/clear/style-night/symbols/subway-london-m.svg @@ -1,23 +1,7 @@ - - - - subway-london-m - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-london-s.svg b/data/styles/clear/style-night/symbols/subway-london-s.svg index 52066ffd86..1710227400 100644 --- a/data/styles/clear/style-night/symbols/subway-london-s.svg +++ b/data/styles/clear/style-night/symbols/subway-london-s.svg @@ -1,23 +1,7 @@ - - - - subway-london-s - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-m.svg b/data/styles/clear/style-night/symbols/subway-m.svg index 25f0bf19f1..4deaf108b3 100644 --- a/data/styles/clear/style-night/symbols/subway-m.svg +++ b/data/styles/clear/style-night/symbols/subway-m.svg @@ -1,18 +1,7 @@ - - - - subway-m - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-madrid-l.svg b/data/styles/clear/style-night/symbols/subway-madrid-l.svg index 38399f2d11..6351ec11a7 100644 --- a/data/styles/clear/style-night/symbols/subway-madrid-l.svg +++ b/data/styles/clear/style-night/symbols/subway-madrid-l.svg @@ -1,23 +1,7 @@ - - - - subway-madrid-l - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-madrid-m.svg b/data/styles/clear/style-night/symbols/subway-madrid-m.svg index b016935308..c08cae054a 100644 --- a/data/styles/clear/style-night/symbols/subway-madrid-m.svg +++ b/data/styles/clear/style-night/symbols/subway-madrid-m.svg @@ -1,23 +1,7 @@ - - - - subway-madrid-m - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-madrid-s.svg b/data/styles/clear/style-night/symbols/subway-madrid-s.svg index 268a26592c..2ce8acd316 100644 --- a/data/styles/clear/style-night/symbols/subway-madrid-s.svg +++ b/data/styles/clear/style-night/symbols/subway-madrid-s.svg @@ -1,23 +1,7 @@ - - - - subway-madrid-s - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-minsk-l.svg b/data/styles/clear/style-night/symbols/subway-minsk-l.svg index ca1335407b..e93c7786ed 100644 --- a/data/styles/clear/style-night/symbols/subway-minsk-l.svg +++ b/data/styles/clear/style-night/symbols/subway-minsk-l.svg @@ -1,18 +1,6 @@ - - - - subway-minsk-l - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-minsk-m.svg b/data/styles/clear/style-night/symbols/subway-minsk-m.svg index 021873265f..0fdfed0a5a 100644 --- a/data/styles/clear/style-night/symbols/subway-minsk-m.svg +++ b/data/styles/clear/style-night/symbols/subway-minsk-m.svg @@ -1,18 +1,6 @@ - - - - subway-minsk-m - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-minsk-s.svg b/data/styles/clear/style-night/symbols/subway-minsk-s.svg index 7f6bf1eecf..f7dd39bac8 100644 --- a/data/styles/clear/style-night/symbols/subway-minsk-s.svg +++ b/data/styles/clear/style-night/symbols/subway-minsk-s.svg @@ -1,18 +1,6 @@ - - - - subway-minsk-s - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-moscow-l.svg b/data/styles/clear/style-night/symbols/subway-moscow-l.svg index fc4d6ca92b..6d607cdc6f 100644 --- a/data/styles/clear/style-night/symbols/subway-moscow-l.svg +++ b/data/styles/clear/style-night/symbols/subway-moscow-l.svg @@ -1,18 +1,6 @@ - - - - subway-moscow-l - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-moscow-m.svg b/data/styles/clear/style-night/symbols/subway-moscow-m.svg index ce489dea5c..be73bfc71a 100644 --- a/data/styles/clear/style-night/symbols/subway-moscow-m.svg +++ b/data/styles/clear/style-night/symbols/subway-moscow-m.svg @@ -1,18 +1,6 @@ - - - - subway-moscow-m - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-moscow-s.svg b/data/styles/clear/style-night/symbols/subway-moscow-s.svg index 9574dc4834..108b261f19 100644 --- a/data/styles/clear/style-night/symbols/subway-moscow-s.svg +++ b/data/styles/clear/style-night/symbols/subway-moscow-s.svg @@ -1,18 +1,6 @@ - - - - subway-moscow-s - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-newyork-l.svg b/data/styles/clear/style-night/symbols/subway-newyork-l.svg index 98cf454786..44172c9ba9 100644 --- a/data/styles/clear/style-night/symbols/subway-newyork-l.svg +++ b/data/styles/clear/style-night/symbols/subway-newyork-l.svg @@ -1,16 +1,7 @@ - - - - subway-newyork-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-newyork-m.svg b/data/styles/clear/style-night/symbols/subway-newyork-m.svg index cafd743e56..09c7268dec 100644 --- a/data/styles/clear/style-night/symbols/subway-newyork-m.svg +++ b/data/styles/clear/style-night/symbols/subway-newyork-m.svg @@ -1,14 +1,7 @@ - - - - subway-newyork-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-newyork-s.svg b/data/styles/clear/style-night/symbols/subway-newyork-s.svg index 9133982204..7757b1be42 100644 --- a/data/styles/clear/style-night/symbols/subway-newyork-s.svg +++ b/data/styles/clear/style-night/symbols/subway-newyork-s.svg @@ -1,17 +1,7 @@ - - - - subway-newyork-s - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-newyork-xs.svg b/data/styles/clear/style-night/symbols/subway-newyork-xs.svg index 9dc0e9ffa4..14d5f32a84 100644 --- a/data/styles/clear/style-night/symbols/subway-newyork-xs.svg +++ b/data/styles/clear/style-night/symbols/subway-newyork-xs.svg @@ -1,14 +1,7 @@ - - - - subway-newyork-xs - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-paris-l.svg b/data/styles/clear/style-night/symbols/subway-paris-l.svg index ffdeaec49e..6a9e7ad361 100644 --- a/data/styles/clear/style-night/symbols/subway-paris-l.svg +++ b/data/styles/clear/style-night/symbols/subway-paris-l.svg @@ -1,22 +1,7 @@ - - - - subway-paris-l - Created with Sketch. - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-paris-m.svg b/data/styles/clear/style-night/symbols/subway-paris-m.svg index 43c81f5427..05f524e3eb 100644 --- a/data/styles/clear/style-night/symbols/subway-paris-m.svg +++ b/data/styles/clear/style-night/symbols/subway-paris-m.svg @@ -1,22 +1,7 @@ - - - - subway-paris-m - Created with Sketch. - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-paris-s.svg b/data/styles/clear/style-night/symbols/subway-paris-s.svg index 95dfa3962c..b42b9af0a7 100644 --- a/data/styles/clear/style-night/symbols/subway-paris-s.svg +++ b/data/styles/clear/style-night/symbols/subway-paris-s.svg @@ -1,22 +1,7 @@ - - - - subway-paris-s - Created with Sketch. - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-rome-l.svg b/data/styles/clear/style-night/symbols/subway-rome-l.svg index 3ec71f7f28..6d12e33a32 100644 --- a/data/styles/clear/style-night/symbols/subway-rome-l.svg +++ b/data/styles/clear/style-night/symbols/subway-rome-l.svg @@ -1,19 +1,7 @@ - - - - subway-rome-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-rome-m.svg b/data/styles/clear/style-night/symbols/subway-rome-m.svg index 7588efed07..b90e5b713a 100644 --- a/data/styles/clear/style-night/symbols/subway-rome-m.svg +++ b/data/styles/clear/style-night/symbols/subway-rome-m.svg @@ -1,19 +1,7 @@ - - - - subway-rome-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-rome-s.svg b/data/styles/clear/style-night/symbols/subway-rome-s.svg index ed966632eb..c31d4fd1de 100644 --- a/data/styles/clear/style-night/symbols/subway-rome-s.svg +++ b/data/styles/clear/style-night/symbols/subway-rome-s.svg @@ -1,19 +1,7 @@ - - - - subway-rome-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-s.svg b/data/styles/clear/style-night/symbols/subway-s.svg index 912585ec3d..5904d94f7a 100644 --- a/data/styles/clear/style-night/symbols/subway-s.svg +++ b/data/styles/clear/style-night/symbols/subway-s.svg @@ -1,20 +1,7 @@ - - - - subway-s - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-spb-l.svg b/data/styles/clear/style-night/symbols/subway-spb-l.svg index f5e8489184..57ebe2cd57 100644 --- a/data/styles/clear/style-night/symbols/subway-spb-l.svg +++ b/data/styles/clear/style-night/symbols/subway-spb-l.svg @@ -1,19 +1,7 @@ - - - - subway-spb-l - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-spb-m.svg b/data/styles/clear/style-night/symbols/subway-spb-m.svg index 7d2142b9bb..145ef93121 100644 --- a/data/styles/clear/style-night/symbols/subway-spb-m.svg +++ b/data/styles/clear/style-night/symbols/subway-spb-m.svg @@ -1,19 +1,7 @@ - - - - subway-spb-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-spb-s.svg b/data/styles/clear/style-night/symbols/subway-spb-s.svg index ac0f8ef40c..fd3d50ee5f 100644 --- a/data/styles/clear/style-night/symbols/subway-spb-s.svg +++ b/data/styles/clear/style-night/symbols/subway-spb-s.svg @@ -1,19 +1,7 @@ - - - - subway-spb-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/subway-xs.svg b/data/styles/clear/style-night/symbols/subway-xs.svg index 673654d6fe..6a90996502 100644 --- a/data/styles/clear/style-night/symbols/subway-xs.svg +++ b/data/styles/clear/style-night/symbols/subway-xs.svg @@ -1,19 +1,7 @@ - - - - subway-xs - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/survey_point-l.svg b/data/styles/clear/style-night/symbols/survey_point-l.svg index de74c8300d..3b955b4a95 100644 --- a/data/styles/clear/style-night/symbols/survey_point-l.svg +++ b/data/styles/clear/style-night/symbols/survey_point-l.svg @@ -1,15 +1,3 @@ - - - - survey_point-l - Created with Sketch. - - - - - - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-night/symbols/survey_point-m.svg b/data/styles/clear/style-night/symbols/survey_point-m.svg index 8dd8689f67..ccf1ab4d1f 100644 --- a/data/styles/clear/style-night/symbols/survey_point-m.svg +++ b/data/styles/clear/style-night/symbols/survey_point-m.svg @@ -1,15 +1,3 @@ - - - - survey_point-m - Created with Sketch. - - - - - - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-night/symbols/survey_point-s.svg b/data/styles/clear/style-night/symbols/survey_point-s.svg index 009e4881b6..2f336dbb98 100644 --- a/data/styles/clear/style-night/symbols/survey_point-s.svg +++ b/data/styles/clear/style-night/symbols/survey_point-s.svg @@ -1,15 +1,3 @@ - - - - survey_point-s - Created with Sketch. - - - - - - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-night/symbols/sweets-l.svg b/data/styles/clear/style-night/symbols/sweets-l.svg index 88e1d7a45b..af4752db71 100644 --- a/data/styles/clear/style-night/symbols/sweets-l.svg +++ b/data/styles/clear/style-night/symbols/sweets-l.svg @@ -1,20 +1,7 @@ - - - - sweets-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/sweets-m.svg b/data/styles/clear/style-night/symbols/sweets-m.svg index 5eecda9a12..fa81251f53 100644 --- a/data/styles/clear/style-night/symbols/sweets-m.svg +++ b/data/styles/clear/style-night/symbols/sweets-m.svg @@ -1,20 +1,7 @@ - - - - sweets-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/sweets-s.svg b/data/styles/clear/style-night/symbols/sweets-s.svg new file mode 100644 index 0000000000..2bbfec602d --- /dev/null +++ b/data/styles/clear/style-night/symbols/sweets-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/swimming-l.svg b/data/styles/clear/style-night/symbols/swimming-l.svg index d20a8e482a..3e910060bb 100644 --- a/data/styles/clear/style-night/symbols/swimming-l.svg +++ b/data/styles/clear/style-night/symbols/swimming-l.svg @@ -1,14 +1,7 @@ - - - - swimming-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/swimming-m.svg b/data/styles/clear/style-night/symbols/swimming-m.svg index cea6e1381a..d5ae86c451 100644 --- a/data/styles/clear/style-night/symbols/swimming-m.svg +++ b/data/styles/clear/style-night/symbols/swimming-m.svg @@ -1,14 +1,7 @@ - - - - swimming-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/swimming-s.svg b/data/styles/clear/style-night/symbols/swimming-s.svg index 47ae1426da..e1adb2ae3f 100644 --- a/data/styles/clear/style-night/symbols/swimming-s.svg +++ b/data/styles/clear/style-night/symbols/swimming-s.svg @@ -1,14 +1,7 @@ - - - - swimming-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/taoist-l.svg b/data/styles/clear/style-night/symbols/taoist-l.svg index 9fd8e5d27c..c54f386913 100644 --- a/data/styles/clear/style-night/symbols/taoist-l.svg +++ b/data/styles/clear/style-night/symbols/taoist-l.svg @@ -1,22 +1,7 @@ - - - - taoist-l - Created with Sketch. - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/taoist-m.svg b/data/styles/clear/style-night/symbols/taoist-m.svg index 644b9c6f50..c5de0c4e70 100644 --- a/data/styles/clear/style-night/symbols/taoist-m.svg +++ b/data/styles/clear/style-night/symbols/taoist-m.svg @@ -1,16 +1,7 @@ - - - - taoist-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/taoist-s.svg b/data/styles/clear/style-night/symbols/taoist-s.svg index 63b4521ae6..8168db01cd 100644 --- a/data/styles/clear/style-night/symbols/taoist-s.svg +++ b/data/styles/clear/style-night/symbols/taoist-s.svg @@ -1,16 +1,7 @@ - - - - taoist-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/taxi-l.svg b/data/styles/clear/style-night/symbols/taxi-l.svg index b25a69c6e0..706cc4324f 100644 --- a/data/styles/clear/style-night/symbols/taxi-l.svg +++ b/data/styles/clear/style-night/symbols/taxi-l.svg @@ -1,14 +1,7 @@ - - - - taxi-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/taxi-m.svg b/data/styles/clear/style-night/symbols/taxi-m.svg index 31717a74c3..5f62f789b5 100644 --- a/data/styles/clear/style-night/symbols/taxi-m.svg +++ b/data/styles/clear/style-night/symbols/taxi-m.svg @@ -1,14 +1,7 @@ - - - - taxi-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/taxi-s.svg b/data/styles/clear/style-night/symbols/taxi-s.svg new file mode 100644 index 0000000000..5c678d2f69 --- /dev/null +++ b/data/styles/clear/style-night/symbols/taxi-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/tennis-l.svg b/data/styles/clear/style-night/symbols/tennis-l.svg index 7aaa6eb9d0..e7c5916f4c 100644 --- a/data/styles/clear/style-night/symbols/tennis-l.svg +++ b/data/styles/clear/style-night/symbols/tennis-l.svg @@ -1,14 +1,7 @@ - - - - tennis-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/tennis-m.svg b/data/styles/clear/style-night/symbols/tennis-m.svg index 01494ed6c4..a36f107647 100644 --- a/data/styles/clear/style-night/symbols/tennis-m.svg +++ b/data/styles/clear/style-night/symbols/tennis-m.svg @@ -1,14 +1,7 @@ - - - - tennis-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/tennis-s.svg b/data/styles/clear/style-night/symbols/tennis-s.svg index 0f0c72dafe..b69387a2c0 100644 --- a/data/styles/clear/style-night/symbols/tennis-s.svg +++ b/data/styles/clear/style-night/symbols/tennis-s.svg @@ -1,14 +1,7 @@ - - - - tennis-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/theatre-l.svg b/data/styles/clear/style-night/symbols/theatre-l.svg index 2aec69ad71..e9fb13f91c 100644 --- a/data/styles/clear/style-night/symbols/theatre-l.svg +++ b/data/styles/clear/style-night/symbols/theatre-l.svg @@ -1,14 +1,7 @@ - - - - theatre-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/theatre-m.svg b/data/styles/clear/style-night/symbols/theatre-m.svg index caadf8de70..34c6fd881d 100644 --- a/data/styles/clear/style-night/symbols/theatre-m.svg +++ b/data/styles/clear/style-night/symbols/theatre-m.svg @@ -1,14 +1,7 @@ - - - - theatre-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/theatre-s.svg b/data/styles/clear/style-night/symbols/theatre-s.svg index 7fdd68fd75..1d411db651 100644 --- a/data/styles/clear/style-night/symbols/theatre-s.svg +++ b/data/styles/clear/style-night/symbols/theatre-s.svg @@ -1,16 +1,7 @@ - - - - theatre-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/ticket-shop-l.svg b/data/styles/clear/style-night/symbols/ticket-shop-l.svg index afd3e9483e..648a0edcd9 100644 --- a/data/styles/clear/style-night/symbols/ticket-shop-l.svg +++ b/data/styles/clear/style-night/symbols/ticket-shop-l.svg @@ -1,26 +1,7 @@ - - - - ticket-shop-l - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/ticket-shop-m.svg b/data/styles/clear/style-night/symbols/ticket-shop-m.svg index 2af8892f99..1e3683d28d 100644 --- a/data/styles/clear/style-night/symbols/ticket-shop-m.svg +++ b/data/styles/clear/style-night/symbols/ticket-shop-m.svg @@ -1,26 +1,7 @@ - - - - ticket-shop-m - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/ticket-shop-s.svg b/data/styles/clear/style-night/symbols/ticket-shop-s.svg new file mode 100644 index 0000000000..f070c70910 --- /dev/null +++ b/data/styles/clear/style-night/symbols/ticket-shop-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/tire-repair-l.svg b/data/styles/clear/style-night/symbols/tire-repair-l.svg index 6fd9595ad8..403e1fa138 100644 --- a/data/styles/clear/style-night/symbols/tire-repair-l.svg +++ b/data/styles/clear/style-night/symbols/tire-repair-l.svg @@ -1,21 +1,7 @@ - - - - tire-repair-l - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/tire-repair-m.svg b/data/styles/clear/style-night/symbols/tire-repair-m.svg index 545f9c76df..c964514c35 100644 --- a/data/styles/clear/style-night/symbols/tire-repair-m.svg +++ b/data/styles/clear/style-night/symbols/tire-repair-m.svg @@ -1,21 +1,7 @@ - - - - tire-repair-m - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/tire-repair-s.svg b/data/styles/clear/style-night/symbols/tire-repair-s.svg new file mode 100644 index 0000000000..1e98890556 --- /dev/null +++ b/data/styles/clear/style-night/symbols/tire-repair-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/toilets-l.svg b/data/styles/clear/style-night/symbols/toilets-l.svg index d74a6f7b39..c909a3ad3e 100644 --- a/data/styles/clear/style-night/symbols/toilets-l.svg +++ b/data/styles/clear/style-night/symbols/toilets-l.svg @@ -1,16 +1,7 @@ - - - - toilets-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/toilets-m.svg b/data/styles/clear/style-night/symbols/toilets-m.svg index a8969baf6d..84b1209ea8 100644 --- a/data/styles/clear/style-night/symbols/toilets-m.svg +++ b/data/styles/clear/style-night/symbols/toilets-m.svg @@ -1,16 +1,7 @@ - - - - toilets-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/toilets-s.svg b/data/styles/clear/style-night/symbols/toilets-s.svg index 0486f429bb..527c2e54f0 100644 --- a/data/styles/clear/style-night/symbols/toilets-s.svg +++ b/data/styles/clear/style-night/symbols/toilets-s.svg @@ -1,16 +1,7 @@ - - - - toilets-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/toll_booth-l.svg b/data/styles/clear/style-night/symbols/toll_booth-l.svg index 178b7a48e2..48b1fb2b0a 100644 --- a/data/styles/clear/style-night/symbols/toll_booth-l.svg +++ b/data/styles/clear/style-night/symbols/toll_booth-l.svg @@ -1,17 +1,7 @@ - - - - toll_booth-l - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/toll_booth-m.svg b/data/styles/clear/style-night/symbols/toll_booth-m.svg index d1bd484be4..1e322da78c 100644 --- a/data/styles/clear/style-night/symbols/toll_booth-m.svg +++ b/data/styles/clear/style-night/symbols/toll_booth-m.svg @@ -1,23 +1,7 @@ - - - - toll_booth-m - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/toll_booth-s.svg b/data/styles/clear/style-night/symbols/toll_booth-s.svg index e84a352df7..3c98ad919e 100644 --- a/data/styles/clear/style-night/symbols/toll_booth-s.svg +++ b/data/styles/clear/style-night/symbols/toll_booth-s.svg @@ -1,17 +1,7 @@ - - - - toll_booth-s - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/tomb-l.svg b/data/styles/clear/style-night/symbols/tomb-l.svg index b74348851a..3d28fea5c9 100644 --- a/data/styles/clear/style-night/symbols/tomb-l.svg +++ b/data/styles/clear/style-night/symbols/tomb-l.svg @@ -1,16 +1,7 @@ - - - - tomb-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/tomb-m.svg b/data/styles/clear/style-night/symbols/tomb-m.svg index aca7dd4d20..1f24316136 100644 --- a/data/styles/clear/style-night/symbols/tomb-m.svg +++ b/data/styles/clear/style-night/symbols/tomb-m.svg @@ -1,16 +1,7 @@ - - - - tomb-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/tomb-s.svg b/data/styles/clear/style-night/symbols/tomb-s.svg index 73f5ae2a5b..637040b870 100644 --- a/data/styles/clear/style-night/symbols/tomb-s.svg +++ b/data/styles/clear/style-night/symbols/tomb-s.svg @@ -1,16 +1,7 @@ - - - - tomb-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/tourism-l.svg b/data/styles/clear/style-night/symbols/tourism-l.svg index e8bdc71ef0..a9574b49f5 100644 --- a/data/styles/clear/style-night/symbols/tourism-l.svg +++ b/data/styles/clear/style-night/symbols/tourism-l.svg @@ -1,14 +1,7 @@ - - - - tourism-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/tourism-m.svg b/data/styles/clear/style-night/symbols/tourism-m.svg index 2e4e40dd2d..5aec4b3ea6 100644 --- a/data/styles/clear/style-night/symbols/tourism-m.svg +++ b/data/styles/clear/style-night/symbols/tourism-m.svg @@ -1,14 +1,7 @@ - - - - tourism-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/tourism-s.svg b/data/styles/clear/style-night/symbols/tourism-s.svg index 64155d8e10..f212e54ebe 100644 --- a/data/styles/clear/style-night/symbols/tourism-s.svg +++ b/data/styles/clear/style-night/symbols/tourism-s.svg @@ -1,14 +1,7 @@ - - - - tourism-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/toys-l.svg b/data/styles/clear/style-night/symbols/toys-l.svg index 4a44d98618..81d09b138e 100644 --- a/data/styles/clear/style-night/symbols/toys-l.svg +++ b/data/styles/clear/style-night/symbols/toys-l.svg @@ -1,20 +1,7 @@ - - - - toys-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/toys-m.svg b/data/styles/clear/style-night/symbols/toys-m.svg index c277ac8612..79bd10933b 100644 --- a/data/styles/clear/style-night/symbols/toys-m.svg +++ b/data/styles/clear/style-night/symbols/toys-m.svg @@ -1,20 +1,7 @@ - - - - toys-m - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/toys-s.svg b/data/styles/clear/style-night/symbols/toys-s.svg new file mode 100644 index 0000000000..055b50f3b6 --- /dev/null +++ b/data/styles/clear/style-night/symbols/toys-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/train-l.svg b/data/styles/clear/style-night/symbols/train-l.svg index 388b489989..3ef9e59702 100644 --- a/data/styles/clear/style-night/symbols/train-l.svg +++ b/data/styles/clear/style-night/symbols/train-l.svg @@ -1,21 +1,7 @@ - - - - train-l - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/train-m.svg b/data/styles/clear/style-night/symbols/train-m.svg index f377747c99..cd20388793 100644 --- a/data/styles/clear/style-night/symbols/train-m.svg +++ b/data/styles/clear/style-night/symbols/train-m.svg @@ -1,19 +1,7 @@ - - - - train-m - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/train-s.svg b/data/styles/clear/style-night/symbols/train-s.svg index 6423e2071e..6c07854011 100644 --- a/data/styles/clear/style-night/symbols/train-s.svg +++ b/data/styles/clear/style-night/symbols/train-s.svg @@ -1,19 +1,7 @@ - - - - train-s - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/train-xs.svg b/data/styles/clear/style-night/symbols/train-xs.svg new file mode 100644 index 0000000000..6a90996502 --- /dev/null +++ b/data/styles/clear/style-night/symbols/train-xs.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/tram-l.svg b/data/styles/clear/style-night/symbols/tram-l.svg index 3c6b2b4ba8..b2562fee7a 100644 --- a/data/styles/clear/style-night/symbols/tram-l.svg +++ b/data/styles/clear/style-night/symbols/tram-l.svg @@ -1,20 +1,7 @@ - - - - tram-l - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/tram-m.svg b/data/styles/clear/style-night/symbols/tram-m.svg index e8cdaf3e34..f2e92c548c 100644 --- a/data/styles/clear/style-night/symbols/tram-m.svg +++ b/data/styles/clear/style-night/symbols/tram-m.svg @@ -1,18 +1,7 @@ - - - - tram-m - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/tram-s.svg b/data/styles/clear/style-night/symbols/tram-s.svg index c286349f62..006d2f9b4e 100644 --- a/data/styles/clear/style-night/symbols/tram-s.svg +++ b/data/styles/clear/style-night/symbols/tram-s.svg @@ -1,20 +1,7 @@ - - - - tram-s - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/travel_agency_shop-l.svg b/data/styles/clear/style-night/symbols/travel_agency_shop-l.svg new file mode 100644 index 0000000000..645a2dc6b0 --- /dev/null +++ b/data/styles/clear/style-night/symbols/travel_agency_shop-l.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/travel_agency_shop-m.svg b/data/styles/clear/style-night/symbols/travel_agency_shop-m.svg new file mode 100644 index 0000000000..d4403856ca --- /dev/null +++ b/data/styles/clear/style-night/symbols/travel_agency_shop-m.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/travel_agency_shop-s.svg b/data/styles/clear/style-night/symbols/travel_agency_shop-s.svg new file mode 100644 index 0000000000..62ff1faf0b --- /dev/null +++ b/data/styles/clear/style-night/symbols/travel_agency_shop-s.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/clear/style-night/symbols/tree-l.svg b/data/styles/clear/style-night/symbols/tree-l.svg deleted file mode 100644 index da626c2b7c..0000000000 --- a/data/styles/clear/style-night/symbols/tree-l.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - tree-l - Created with Sketch. - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/tree-m.svg b/data/styles/clear/style-night/symbols/tree-m.svg deleted file mode 100644 index 38896299a3..0000000000 --- a/data/styles/clear/style-night/symbols/tree-m.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - tree-m - Created with Sketch. - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/tree-s.svg b/data/styles/clear/style-night/symbols/tree-s.svg deleted file mode 100644 index a99112e310..0000000000 --- a/data/styles/clear/style-night/symbols/tree-s.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - tree-s - Created with Sketch. - - - - - \ No newline at end of file diff --git a/data/styles/clear/style-night/symbols/vending-l.svg b/data/styles/clear/style-night/symbols/vending-l.svg index 92b08b943f..f71a0ac254 100644 --- a/data/styles/clear/style-night/symbols/vending-l.svg +++ b/data/styles/clear/style-night/symbols/vending-l.svg @@ -1,12 +1,6 @@ - - - - vending-l - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/vending-m.svg b/data/styles/clear/style-night/symbols/vending-m.svg index a8c0fac7ae..286801e020 100644 --- a/data/styles/clear/style-night/symbols/vending-m.svg +++ b/data/styles/clear/style-night/symbols/vending-m.svg @@ -1,12 +1,6 @@ - - - - vending-m - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/vending-s.svg b/data/styles/clear/style-night/symbols/vending-s.svg new file mode 100644 index 0000000000..493e4dfdf5 --- /dev/null +++ b/data/styles/clear/style-night/symbols/vending-s.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/data/styles/clear/style-night/symbols/veterinary-l.svg b/data/styles/clear/style-night/symbols/veterinary-l.svg index e3a02e3e2f..3aa668e03d 100644 --- a/data/styles/clear/style-night/symbols/veterinary-l.svg +++ b/data/styles/clear/style-night/symbols/veterinary-l.svg @@ -1,22 +1,7 @@ - - - - veterinary-l - Created with Sketch. - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/veterinary-m.svg b/data/styles/clear/style-night/symbols/veterinary-m.svg index 77bfe2f7cb..92d72bba71 100644 --- a/data/styles/clear/style-night/symbols/veterinary-m.svg +++ b/data/styles/clear/style-night/symbols/veterinary-m.svg @@ -1,16 +1,7 @@ - - - - veterinary-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/veterinary-s.svg b/data/styles/clear/style-night/symbols/veterinary-s.svg index bd422133f1..256c3d44c7 100644 --- a/data/styles/clear/style-night/symbols/veterinary-s.svg +++ b/data/styles/clear/style-night/symbols/veterinary-s.svg @@ -1,16 +1,7 @@ - - - - veterinary-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/viewpoint-l.svg b/data/styles/clear/style-night/symbols/viewpoint-l.svg index bb8a2ae55c..49e92fc737 100644 --- a/data/styles/clear/style-night/symbols/viewpoint-l.svg +++ b/data/styles/clear/style-night/symbols/viewpoint-l.svg @@ -1,18 +1,7 @@ - - - - viewpoint-l - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/viewpoint-m.svg b/data/styles/clear/style-night/symbols/viewpoint-m.svg index 07b17fb259..6d4dd4aab1 100644 --- a/data/styles/clear/style-night/symbols/viewpoint-m.svg +++ b/data/styles/clear/style-night/symbols/viewpoint-m.svg @@ -1,18 +1,7 @@ - - - - viewpoint-m - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/viewpoint-s.svg b/data/styles/clear/style-night/symbols/viewpoint-s.svg index de66ba0645..c79b144e81 100644 --- a/data/styles/clear/style-night/symbols/viewpoint-s.svg +++ b/data/styles/clear/style-night/symbols/viewpoint-s.svg @@ -1,14 +1,7 @@ - - - - viewpoint-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/volcano-l.svg b/data/styles/clear/style-night/symbols/volcano-l.svg index 42642b8137..4d59b77725 100644 --- a/data/styles/clear/style-night/symbols/volcano-l.svg +++ b/data/styles/clear/style-night/symbols/volcano-l.svg @@ -1,12 +1,3 @@ - - - - volcano-l - Created with Sketch. - - - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-night/symbols/volcano-m.svg b/data/styles/clear/style-night/symbols/volcano-m.svg index fe61d3932f..02d06c5b1a 100644 --- a/data/styles/clear/style-night/symbols/volcano-m.svg +++ b/data/styles/clear/style-night/symbols/volcano-m.svg @@ -1,12 +1,3 @@ - - - - volcano-m - Created with Sketch. - - - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-night/symbols/volcano-s.svg b/data/styles/clear/style-night/symbols/volcano-s.svg index 5030a88a77..80f5700f5b 100644 --- a/data/styles/clear/style-night/symbols/volcano-s.svg +++ b/data/styles/clear/style-night/symbols/volcano-s.svg @@ -1,12 +1,3 @@ - - - - volcano-s - Created with Sketch. - - - - - - - \ No newline at end of file + + + diff --git a/data/styles/clear/style-night/symbols/waste-basket-l.svg b/data/styles/clear/style-night/symbols/waste-basket-l.svg index e79441a391..1aaf5bc650 100644 --- a/data/styles/clear/style-night/symbols/waste-basket-l.svg +++ b/data/styles/clear/style-night/symbols/waste-basket-l.svg @@ -1,13 +1,6 @@ - - - - waste-basket-l - Created with Sketch. - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/waste-basket-m.svg b/data/styles/clear/style-night/symbols/waste-basket-m.svg new file mode 100644 index 0000000000..86dcae8d26 --- /dev/null +++ b/data/styles/clear/style-night/symbols/waste-basket-m.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/data/styles/clear/style-night/symbols/waste-basket-s.svg b/data/styles/clear/style-night/symbols/waste-basket-s.svg index 847ad12928..4a045ccb45 100644 --- a/data/styles/clear/style-night/symbols/waste-basket-s.svg +++ b/data/styles/clear/style-night/symbols/waste-basket-s.svg @@ -1,13 +1,6 @@ - - - - waste-basket-s - Created with Sketch. - - - - - - - - \ No newline at end of file + + + + + + diff --git a/data/styles/clear/style-night/symbols/waterfall-l.svg b/data/styles/clear/style-night/symbols/waterfall-l.svg index f25485a041..2902c5c4db 100644 --- a/data/styles/clear/style-night/symbols/waterfall-l.svg +++ b/data/styles/clear/style-night/symbols/waterfall-l.svg @@ -1,14 +1,7 @@ - - - - waterfall-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/waterfall-m.svg b/data/styles/clear/style-night/symbols/waterfall-m.svg index ef6d33972d..8d6dec5dfd 100644 --- a/data/styles/clear/style-night/symbols/waterfall-m.svg +++ b/data/styles/clear/style-night/symbols/waterfall-m.svg @@ -1,14 +1,7 @@ - - - - waterfall-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/waterfall-s.svg b/data/styles/clear/style-night/symbols/waterfall-s.svg index c56528a56d..f019e7f2b6 100644 --- a/data/styles/clear/style-night/symbols/waterfall-s.svg +++ b/data/styles/clear/style-night/symbols/waterfall-s.svg @@ -1,14 +1,7 @@ - - - - waterfall-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/wayside_shrine-l.svg b/data/styles/clear/style-night/symbols/wayside_shrine-l.svg index 33e2e99f25..0f43f2395a 100644 --- a/data/styles/clear/style-night/symbols/wayside_shrine-l.svg +++ b/data/styles/clear/style-night/symbols/wayside_shrine-l.svg @@ -1,16 +1,7 @@ - - - - wayside_shrine-l - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/wayside_shrine-m.svg b/data/styles/clear/style-night/symbols/wayside_shrine-m.svg index 7fe281c07c..a1ef8f6c80 100644 --- a/data/styles/clear/style-night/symbols/wayside_shrine-m.svg +++ b/data/styles/clear/style-night/symbols/wayside_shrine-m.svg @@ -1,16 +1,7 @@ - - - - wayside_shrine-m - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/wayside_shrine-s.svg b/data/styles/clear/style-night/symbols/wayside_shrine-s.svg index 63a33ab9e3..166ff6e3f0 100644 --- a/data/styles/clear/style-night/symbols/wayside_shrine-s.svg +++ b/data/styles/clear/style-night/symbols/wayside_shrine-s.svg @@ -1,16 +1,7 @@ - - - - wayside_shrine-s - Created with Sketch. - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/windmill-l.svg b/data/styles/clear/style-night/symbols/windmill-l.svg index 54075ba9a5..91add6ec41 100644 --- a/data/styles/clear/style-night/symbols/windmill-l.svg +++ b/data/styles/clear/style-night/symbols/windmill-l.svg @@ -1,14 +1,7 @@ - - - - windmill-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/windmill-m.svg b/data/styles/clear/style-night/symbols/windmill-m.svg index 0cb13f3a93..0184bb2df3 100644 --- a/data/styles/clear/style-night/symbols/windmill-m.svg +++ b/data/styles/clear/style-night/symbols/windmill-m.svg @@ -1,14 +1,7 @@ - - - - windmill-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/windmill-s.svg b/data/styles/clear/style-night/symbols/windmill-s.svg index 9e3e38531b..160ead3273 100644 --- a/data/styles/clear/style-night/symbols/windmill-s.svg +++ b/data/styles/clear/style-night/symbols/windmill-s.svg @@ -1,14 +1,7 @@ - - - - windmill-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/zero-icon.svg b/data/styles/clear/style-night/symbols/zero-icon.svg index 8ff412099f..dfd18cca00 100644 --- a/data/styles/clear/style-night/symbols/zero-icon.svg +++ b/data/styles/clear/style-night/symbols/zero-icon.svg @@ -1,8 +1 @@ - - - - zero-icon - Created with Sketch. - - - \ No newline at end of file + diff --git a/data/styles/clear/style-night/symbols/zoo-l.svg b/data/styles/clear/style-night/symbols/zoo-l.svg index f3eb27694c..375a358caa 100644 --- a/data/styles/clear/style-night/symbols/zoo-l.svg +++ b/data/styles/clear/style-night/symbols/zoo-l.svg @@ -1,14 +1,7 @@ - - - - zoo-l - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/zoo-m.svg b/data/styles/clear/style-night/symbols/zoo-m.svg index b12688bf54..a2e4100a3b 100644 --- a/data/styles/clear/style-night/symbols/zoo-m.svg +++ b/data/styles/clear/style-night/symbols/zoo-m.svg @@ -1,14 +1,7 @@ - - - - zoo-m - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/symbols/zoo-s.svg b/data/styles/clear/style-night/symbols/zoo-s.svg index b45e7003c0..4413abf845 100644 --- a/data/styles/clear/style-night/symbols/zoo-s.svg +++ b/data/styles/clear/style-night/symbols/zoo-s.svg @@ -1,14 +1,7 @@ - - - - zoo-s - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/data/styles/clear/style-night/xhdpi/search-adv.png b/data/styles/clear/style-night/xhdpi/search-adv.png new file mode 100644 index 0000000000..4222b14e66 Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/search-adv.png differ diff --git a/data/styles/clear/style-night/xhdpi/search-booking.png b/data/styles/clear/style-night/xhdpi/search-booking.png index 15abac94c4..a0dca277ed 100644 Binary files a/data/styles/clear/style-night/xhdpi/search-booking.png and b/data/styles/clear/style-night/xhdpi/search-booking.png differ diff --git a/data/styles/clear/style-night/xhdpi/search-result.png b/data/styles/clear/style-night/xhdpi/search-result.png index b6a5a58359..dfbe124652 100644 Binary files a/data/styles/clear/style-night/xhdpi/search-result.png and b/data/styles/clear/style-night/xhdpi/search-result.png differ diff --git a/data/styles/clear/style-night/xhdpi/search-tinkoff.png b/data/styles/clear/style-night/xhdpi/search-tinkoff.png index 93123114dd..5e7a765453 100644 Binary files a/data/styles/clear/style-night/xhdpi/search-tinkoff.png and b/data/styles/clear/style-night/xhdpi/search-tinkoff.png differ diff --git a/data/styles/clear/style-night/xxhdpi/search-adv.png b/data/styles/clear/style-night/xxhdpi/search-adv.png new file mode 100644 index 0000000000..0207764623 Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/search-adv.png differ diff --git a/data/styles/clear/style-night/xxhdpi/search-booking.png b/data/styles/clear/style-night/xxhdpi/search-booking.png index f8cc10ed09..013873a49f 100644 Binary files a/data/styles/clear/style-night/xxhdpi/search-booking.png and b/data/styles/clear/style-night/xxhdpi/search-booking.png differ diff --git a/data/styles/clear/style-night/xxhdpi/search-result.png b/data/styles/clear/style-night/xxhdpi/search-result.png index 00416068c4..5bf972a4cd 100644 Binary files a/data/styles/clear/style-night/xxhdpi/search-result.png and b/data/styles/clear/style-night/xxhdpi/search-result.png differ diff --git a/data/styles/clear/style-night/xxhdpi/search-tinkoff.png b/data/styles/clear/style-night/xxhdpi/search-tinkoff.png index 48299f5a44..7d2187daf6 100644 Binary files a/data/styles/clear/style-night/xxhdpi/search-tinkoff.png and b/data/styles/clear/style-night/xxhdpi/search-tinkoff.png differ diff --git a/data/styles/vehicle/include/Basemap_label.mapcss b/data/styles/vehicle/include/Basemap_label.mapcss index cca86523fb..16a3277918 100644 --- a/data/styles/vehicle/include/Basemap_label.mapcss +++ b/data/styles/vehicle/include/Basemap_label.mapcss @@ -602,34 +602,34 @@ area|z17[building], node|z17[building], area|z17[addr:housenumber][addr:street], node|z17[addr:housenumber][addr:street] -{font-size: 13;} +{font-size: 15;} area|z17[building]::int_name, node|z17[building]::int_name, area|z17[addr:housenumber][addr:street]::int_name, node|z17[addr:housenumber][addr:street]::int_name -{font-size: 12.5;} +{font-size: 14.5;} area|z18[building], node|z18[building], area|z18[addr:housenumber][addr:street], node|z18[addr:housenumber][addr:street] -{font-size: 14;} +{font-size: 16;} area|z18[building]::int_name, node|z18[building]::int_name, area|z18[addr:housenumber][addr:street]::int_name, node|z18[addr:housenumber][addr:street]::int_name -{font-size: 13;} +{font-size: 15;} area|z19[building], node|z19[building], area|z19[addr:housenumber][addr:street], node|z19[addr:housenumber][addr:street] -{font-size: 14.5;} +{font-size: 17.5;} area|z19[building]::int_name, node|z19[building]::int_name, area|z19[addr:housenumber][addr:street]::int_name, node|z19[addr:housenumber][addr:street]::int_name -{font-size: 14;} +{font-size: 17;} diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index 9bacb6bb4e..f0eb6e5b29 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -185,7 +185,7 @@ node|z17-[boundary=national_park], area|z17-[boundary=national_park], node|z17-[leisure=nature_reserve], area|z17-[leisure=nature_reserve] -{icon-image: nparkf-l.svg;text-offset: 10;font-size: 12.75;text-halo-opacity: 0.9;} +{icon-image: nparkf-l.svg;text-offset: 10;font-size: 13.75;text-halo-opacity: 0.9;} @@ -300,7 +300,7 @@ area|z15[building=train_station]::int_name, node|z16[railway=station], node|z16[railway=halt], area|z16[building=train_station], -{icon-image: train-l.svg;text-offset: 8;font-size: 12.75;text-halo-opacity: 0.8;} +{icon-image: train-l.svg;text-offset: 8;font-size: 13.75;text-halo-opacity: 0.8;} node|z16[railway=station]::int_name, node|z16[railway=halt]::int_name, area|z16[building=train_station]::int_name, @@ -308,7 +308,7 @@ area|z16[building=train_station]::int_name, node|z17-[railway=station], node|z17-[railway=halt], area|z17-[building=train_station], -{icon-image: train-l.svg;text-offset: 8;font-size: 13;text-halo-opacity: 0.9;} +{icon-image: train-l.svg;text-offset: 8;font-size: 14;text-halo-opacity: 0.9;} node|z17-[railway=station]::int_name, node|z17-[railway=halt]::int_name, area|z17-[building=train_station]::int_name, @@ -333,9 +333,9 @@ node|z16-[railway=station][transport=subway]::int_name node|z17-[railway=subway_entrance] -{icon-image: subway-entrance-l.svg;text-offset: 8;font-size: 13.25;text-halo-opacity: 0.9;} +{icon-image: subway-entrance-l.svg;text-offset: 8;font-size: 14.25;text-halo-opacity: 0.9;} node|z17-[railway=subway_entrance]::int_name -{text-offset: 8;font-size: 11;text-halo-opacity: 0.9;} /*check*/ +{text-offset: 8;font-size: 12;text-halo-opacity: 0.9;} /*check*/ /* 3.2.1 Moscow Subway Station */ @@ -371,13 +371,13 @@ node|z16[railway=subway_entrance][city=moscow] node|z16[railway=subway_entrance][city=moscow]::int_name {text-offset: 25;font-size: 10;} node|z17[railway=subway_entrance][city=moscow] -{icon-image: subway-moscow-l.svg;text-offset: 10;font-size: 12.75;} +{icon-image: subway-moscow-l.svg;text-offset: 10;font-size: 13.75;} node|z17[railway=subway_entrance][city=moscow]::int_name -{text-offset: 25;font-size: 11;} +{text-offset: 25;font-size: 12;} node|z18-[railway=subway_entrance][city=moscow] -{icon-image: subway-moscow-l.svg;text-offset: 10;font-size: 13.5;} +{icon-image: subway-moscow-l.svg;text-offset: 10;font-size: 14.5;} node|z18-[railway=subway_entrance][city=moscow]::int_name -{text-offset: 25;font-size: 11;} +{text-offset: 25;font-size: 12;} /* 3.2.2 Saint Petersburg Subway Station */ @@ -408,30 +408,30 @@ node|z16[railway=subway_entrance][city=spb] node|z16[railway=subway_entrance][city=spb]::int_name {text-offset: 25;font-size: 11;text-halo-opacity: 0.8;} node|z17[railway=subway_entrance][city=spb] -{icon-image: subway-spb-l.svg;text-offset: 8;font-size: 12.75;text-halo-opacity: 0.8;} +{icon-image: subway-spb-l.svg;text-offset: 8;font-size: 13.75;text-halo-opacity: 0.8;} node|z17[railway=subway_entrance][city=spb]::int_name -{text-offset: 25;font-size: 11;text-halo-opacity: 0.8;} -node|z18-[railway=subway_entrance][city=spb] -{icon-image: subway-spb-l.svg;text-offset: 8;font-size: 13.5;text-halo-opacity: 0.8;} -node|z18-[railway=subway_entrance][city=spb]::int_name {text-offset: 25;font-size: 12;text-halo-opacity: 0.8;} +node|z18-[railway=subway_entrance][city=spb] +{icon-image: subway-spb-l.svg;text-offset: 8;font-size: 14.5;text-halo-opacity: 0.8;} +node|z18-[railway=subway_entrance][city=spb]::int_name +{text-offset: 25;font-size: 13;text-halo-opacity: 0.8;} /* 3.2.3 Minsk Subway Station */ node|z13[railway=station][transport=subway][city=minsk] {icon-image: subway-minsk-m.svg;text-offset: 4;font-size: 10;text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;icon-min-distance: 1;} node|z14[railway=station][transport=subway][city=minsk] {icon-image: subway-minsk-m.svg;text-offset: 5;} node|z15[railway=station][transport=subway][city=minsk] {icon-image: subway-minsk-m.svg;text-offset: 5;} -node|z16[railway=station][transport=subway][city=minsk] {icon-image: none.svg;font-size: 10;text: name;text-color: @district_label;text-halo-radius: 0;}/*check none*/ -node|z17-[railway=station][transport=subway][city=minsk] {icon-image: none.svg;font-size: 10;text: name;text-color: @district_label;text-halo-radius: 0;}/*check none*/ -node|z17-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-l.svg;text-offset: 6;font-size: 12;text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;} -node|z17[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-l.svg;font-size: 13;} -node|z18-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-l.svg;font-size: 13;} +node|z16[railway=station][transport=subway][city=minsk] {icon-image: zero-icon.svg;font-size: 10;text: name;text-color: @district_label;text-halo-radius: 0;}/*check none*/ +node|z17-[railway=station][transport=subway][city=minsk] {icon-image: zero-icon.svg;font-size: 11;text: name;text-color: @district_label;text-halo-radius: 0;}/*check none*/ +node|z17-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-l.svg;text-offset: 6;font-size: 13;text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;} +node|z17[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-l.svg;font-size: 14;} +node|z18-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-l.svg;font-size: 14;} /* 3.2.4 Kiev Subway Station */ node|z13[railway=station][transport=subway][city=kiev] {icon-image: subway-kiev-m.svg;text-offset: 8;font-size: 10;text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;icon-min-distance: 1;} node|z14[railway=station][transport=subway][city=kiev] {icon-image: subway-kiev-m.svg;} node|z15-16[railway=station][transport=subway][city=kiev] {icon-image: subway-kiev-m.svg;} -node|z17-[railway=station][transport=subway][city=kiev] {icon-image: none.svg;font-size: 10;text: name;text-color: @district_label;text-halo-radius: 0;}/*check none*/ -node|z17-[railway=subway_entrance][city=kiev] {icon-image: subway-kiev-l.svg;font-size: 13;} +node|z17-[railway=station][transport=subway][city=kiev] {icon-image: zero-icon.svg;font-size: 11;text: name;text-color: @district_label;text-halo-radius: 0;}/*check none*/ +node|z17-[railway=subway_entrance][city=kiev] {icon-image: subway-kiev-l.svg;font-size: 14;} /* 3.2.5 London Subway Station */ node|z13[railway=station][transport=subway][city=london] {icon-image: subway-london-m.svg;icon-min-distance: 1;} @@ -476,7 +476,7 @@ node|z13[railway=station][transport=subway][city=roma] {icon-image: subway-rome- node|z14[railway=station][transport=subway][city=roma] {icon-image: subway-rome-m.svg;} node|z15[railway=station][transport=subway][city=roma] {icon-image: subway-rome-m.svg;} node|z16[railway=station][transport=subway][city=roma] {icon-image: subway-rome-l.svg;} -node|z17-[railway=station][transport=subway][city=roma] {icon-image: none.svg;text: name;text-color: @district_label;text-halo-radius: 0;} +node|z17-[railway=station][transport=subway][city=roma] {icon-image: zero-icon.svg;text: name;text-color: @district_label;text-halo-radius: 0;} node|z17-[railway=subway_entrance][city=roma] {icon-image: subway-rome-l.svg;} /* 3.2.11 New York Subway Station */ @@ -493,13 +493,13 @@ node|z17-[railway=subway_entrance][city=newyork] {icon-image: subway-newyork-l.s node|z17[railway=tram_stop], area|z17[railway=tram_stop] -{icon-image: tram-l.svg;text-offset: 8;font-size: 12;text-opacity: 0;text-halo-opacity: 0;} +{icon-image: tram-l.svg;text-offset: 8;font-size: 13;text-opacity: 0;text-halo-opacity: 0;} node|z17-[railway=tram_stop]::int_name, area|z17-[railway=tram_stop]::int_name -{text-offset: 8;font-size: 10;text-opacity: 0; text-halo-opacity: 0;} /*check*/ +{text-offset: 8;font-size: 11;text-opacity: 0; text-halo-opacity: 0;} /*check*/ node|z18-[railway=tram_stop], area|z18-[railway=tram_stop] -{icon-image: tram-l.svg;text-offset: 8;font-size: 12;text-opacity: 0; text-halo-opacity: 0;} +{icon-image: tram-l.svg;text-offset: 8;font-size: 13;text-opacity: 0; text-halo-opacity: 0;} /* 3.4 Bus Station */ @@ -544,28 +544,28 @@ area|z17-[aeroway=airport], node|z17-[aeroway=airport], area|z17-[aeroway=aerodrome], node|z17-[aeroway=aerodrome], -{icon-image: airport-l.svg;text-offset: 7;font-size: 12;} +{icon-image: airport-l.svg;text-offset: 7;font-size: 13;} area|z17-[aeroway=airport]::int_name, node|z17-[aeroway=airport]::int_name, area|z17-[aeroway=aerodrome]::int_name, node|z17-[aeroway=aerodrome]::int_name, -{font-size: 11;} +{font-size: 12;} area|z17-[aeroway=heliport], node|z17-[aeroway=heliport], -{icon-image: helipad-l.svg;text-offset: 10;font-size: 10;text: name;text-color: @poi_label;} +{icon-image: helipad-l.svg;text-offset: 10;font-size: 11;text: name;text-color: @poi_label;} /* 3.7 Aerialway */ node|z15-[railway=level_crossing] -{icon-image: railway-crossing_l.svg;} +{icon-image: railway-crossing-l.svg;} node|z17-[railway=level_crossing] -{icon-image: railway-crossing_xl.svg;} +{icon-image: railway-crossing-xl.svg;} /* 4.TOURISM */ @@ -598,40 +598,40 @@ area|z16[amenity=restaurant] {icon-image: restaurant-l.svg;icon-min-distance: 22;font-size: 12.75;} node|z17[amenity=cafe], area|z17[amenity=cafe] -{icon-image: cafe-l.svg;icon-min-distance: 20;font-size: 12.75;} +{icon-image: cafe-l.svg;icon-min-distance: 20;font-size: 13.75;} node|z17[amenity=restaurant], area|z17[amenity=restaurant] -{icon-image: restaurant-l.svg;icon-min-distance: 22;font-size: 12.75;} +{icon-image: restaurant-l.svg;icon-min-distance: 22;font-size: 13.75;} node|z17[amenity=fast_food], area|z17[amenity=fast_food] -{icon-image: fastfood-l.svg;icon-min-distance: 25;font-size: 12.75;} +{icon-image: fastfood-l.svg;icon-min-distance: 25;font-size: 13.75;} node|z18[amenity=cafe], area|z18[amenity=cafe] -{icon-image: cafe-xl.svg;icon-min-distance: 25;font-size: 13.5;} +{icon-image: cafe-xl.svg;icon-min-distance: 25;font-size: 14.5;} node|z18[amenity=restaurant], area|z18[amenity=restaurant] -{icon-image: restaurant-xl.svg;icon-min-distance: 25;font-size: 13.5;} +{icon-image: restaurant-xl.svg;icon-min-distance: 25;font-size: 14.5;} node|z18[amenity=fast_food], area|z18[amenity=fast_food] -{icon-image: fastfood-xl.svg;icon-min-distance: 25;font-size: 13.5;} +{icon-image: fastfood-xl.svg;icon-min-distance: 25;font-size: 14.5;} node|z19[amenity=cafe], area|z19[amenity=cafe] -{icon-image: cafe-xl.svg;icon-min-distance: 35;font-size: 13.5;} +{icon-image: cafe-xl.svg;icon-min-distance: 35;font-size: 14.5;} node|z19[amenity=restaurant], area|z19[amenity=restaurant] -{icon-image: restaurant-xl.svg;icon-min-distance: 40;font-size: 13.5;} +{icon-image: restaurant-xl.svg;icon-min-distance: 40;font-size: 14.5;} node|z19[amenity=fast_food], area|z19[amenity=fast_food] -{icon-image: fastfood-xl.svg;icon-min-distance: 45;font-size: 13.5;} +{icon-image: fastfood-xl.svg;icon-min-distance: 45;font-size: 14.5;} /* 5.AMENITY (infrastructure) */ node|z17-[amenity=place_of_worship], area|z17-[amenity=place_of_worship], -{text: name;text-color: @poi_label;text-offset: 10;font-size: 9;} +{text: name;text-color: @poi_label;text-offset: 10;font-size: 10;} /*node|z13-[leisure=stadium], area|z13-[leisure=stadium],*/ @@ -672,11 +672,11 @@ area|z16[building=hospital] node|z17[amenity=hospital], node|z17[building=hospital], area|z17[building=hospital] -{icon-image: hospital-l.svg;icon-min-distance: 14;font-size: 12.75;} +{icon-image: hospital-l.svg;icon-min-distance: 14;font-size: 13.75;} node|z18-[amenity=hospital], node|z18-[building=hospital], area|z18-[building=hospital], -{icon-image: hospital-xl.svg;font-size: 13.5;} +{icon-image: hospital-xl.svg;font-size: 14.5;} @@ -694,19 +694,19 @@ node|z16[amenity=university][!name] {} node|z17[amenity=university][name], area|z17[amenity=university][name] -{icon-image: college-l.svg;icon-min-distance: 9;-x-me-text-priority:16000;font-size: 12.75;} +{icon-image: college-l.svg;icon-min-distance: 9;-x-me-text-priority:16000;font-size: 13.75;} node|z17[amenity=university][!name], area|z17[amenity=university][!name] {} node|z18[amenity=university][name], area|z18[amenity=university][name] -{icon-image: college-xl.svg;icon-min-distance: 10;-x-me-text-priority:16000;font-size: 13.5;} +{icon-image: college-xl.svg;icon-min-distance: 10;-x-me-text-priority:16000;font-size: 14.5;} node|z18[amenity=university][!name], area|z18[amenity=university][!name] {} node|z19[amenity=university][name], area|z19[amenity=university][name] -{icon-image: college-xl.svg;font-size: 14.5;-x-me-text-priority:16000;font-size: 13.5;} +{icon-image: college-xl.svg;font-size: 14.5;-x-me-text-priority:16000;font-size: 14.5;} node|z19[amenity=university][!name], area|z19[amenity=university][!name] {} @@ -722,36 +722,36 @@ area|z19[amenity=university][!name] node|z16-[amenity=place_of_worship], area|z16-[amenity=place_of_worship] -{icon-image: place-of-worship-l.svg;icon-min-distance: 10;font-size: 12.75;} +{icon-image: place-of-worship-l.svg;icon-min-distance: 10;font-size: 13;} node|z16-[amenity=place_of_worship][religion=christian], area|z16-[amenity=place_of_worship][religion=christian] -{icon-image: christian-l.svg;font-size: 12.75;} +{icon-image: christian-l.svg;font-size: 13;} node|z16-[amenity=place_of_worship][religion=muslim], area|z16-[amenity=place_of_worship][religion=muslim] -{icon-image: muslim-l.svg;font-size: 12.75;} +{icon-image: muslim-l.svg;font-size: 13;} node|z16-[amenity=place_of_worship][religion=buddhist], area|z16-[amenity=place_of_worship][religion=buddhist] -{icon-image: buddhist-l.svg;font-size: 12.75;} +{icon-image: buddhist-l.svg;font-size: 13;} node|z16-[amenity=place_of_worship][religion=hindu], area|z16-[amenity=place_of_worship][religion=hindu] -{icon-image: hindu-l.svg;font-size: 12.75;} +{icon-image: hindu-l.svg;font-size: 13;} node|z18-[amenity=place_of_worship], area|z18-[amenity=place_of_worship] -{icon-image: place-of-worship-l.svg;font-size: 13.5;} +{icon-image: place-of-worship-l.svg;font-size: 14.5;} node|z18-[amenity=place_of_worship][religion=christian], area|z18-[amenity=place_of_worship][religion=christian] -{icon-image: christian-l.svg;font-size: 13.5;} +{icon-image: christian-l.svg;font-size: 14.5;} node|z18-[amenity=place_of_worship][religion=muslim], area|z18-[amenity=place_of_worship][religion=muslim] -{icon-image: muslim-l.svg;font-size: 13.5;} +{icon-image: muslim-l.svg;font-size: 14.5;} node|z18-[amenity=place_of_worship][religion=buddhist], area|z18-[amenity=place_of_worship][religion=buddhist] -{icon-image: buddhist-l.svg;font-size: 13.5;} +{icon-image: buddhist-l.svg;font-size: 14.5;} node|z18-[amenity=place_of_worship][religion=hindu], area|z18-[amenity=place_of_worship][religion=hindu] -{icon-image: hindu-l.svg;font-size: 13.5;} +{icon-image: hindu-l.svg;font-size: 14.5;} /* 5.5 Others */ @@ -759,15 +759,15 @@ area|z18-[amenity=place_of_worship][religion=hindu] node|z17[amenity=bank], area|z17[amenity=bank] -{icon-image: bank-l.svg;font-size: 12.75; icon-min-distance: 15} +{icon-image: bank-l.svg;font-size: 13.75; icon-min-distance: 15} node|z18-[amenity=bank], area|z18-[amenity=bank] -{icon-image: bank-xl.svg;font-size: 13.5; icon-min-distance: 10} +{icon-image: bank-xl.svg;font-size: 14.5; icon-min-distance: 10} node|z12-14[barrier=toll_booth], area|z12-14[barrier=toll_booth] -{icon-image: toll_booth-s.svg;icon-min-distance: 8;} +{icon-image: toll_booth-m.svg;icon-min-distance: 8;} node|z15-16[barrier=toll_booth], area|z15-16[barrier=toll_booth] {icon-image: toll_booth-l.svg;icon-min-distance: 8;} @@ -797,7 +797,7 @@ area|z17-[amenity=vending_machine] {icon-image: vending-l.svg;icon-min-distance: 20;} node|z17-[amenity=vending_machine][vending=parking_tickets], area|z17-[amenity=vending_machine][vending=parking_tickets] -{icon-image: parking-meter-l.svg;font-size: 12.5;} +{icon-image: parking-meter-l.svg;font-size: 13.5;} node|z18-[amenity=vending_machine], area|z18-[amenity=vending_machine] {icon-image: vending-l.svg;} @@ -826,10 +826,10 @@ area|z15[shop=mall] {icon-image: shop-m.svg;font-size:12.5;icon-min-distance: 6;-x-me-icon-priority:15500; -x-me-text-priority:15500;} node|z16-17[shop=mall], area|z16-17[shop=mall] -{icon-image: shop-l.svg;font-size: 12.75;icon-min-distance: 8;-x-me-icon-priority:15500; -x-me-text-priority:15500;} +{icon-image: shop-l.svg;font-size: 13.25;icon-min-distance: 8;-x-me-icon-priority:15500; -x-me-text-priority:15500;} node|z18-[shop=mall], area|z18-[shop=mall] -{icon-image: shop-xl.svg;font-size: 13.5;icon-min-distance: 8;-x-me-icon-priority:15500; -x-me-text-priority:15500;} +{icon-image: shop-xl.svg;font-size: 14.5;icon-min-distance: 8;-x-me-icon-priority:15500; -x-me-text-priority:15500;} node|z14[shop=supermarket], area|z14[shop=supermarket] @@ -839,12 +839,12 @@ area|z15[shop=supermarket] {icon-image: grocery-m.svg;font-size:12.5;icon-min-distance: 3;} node|z16-17[shop=supermarket], area|z16-17[shop=supermarket] -{icon-image: grocery-l.svg;font-size: 12.75;icon-min-distance: 16;text-min-distance:6;} +{icon-image: grocery-l.svg;font-size: 13.25;icon-min-distance: 16;text-min-distance:6;} node|z18-[shop=supermarket], area|z18-[shop=supermarket] -{icon-image: grocery-xl.svg;font-size: 13.5;icon-min-distance: 15;} +{icon-image: grocery-xl.svg;font-size: 14.5;icon-min-distance: 15;} node|z15[shop=car_repair][service=tyres], @@ -855,37 +855,37 @@ area|z16[shop=car_repair][service=tyres] {icon-image: car-repair-l.svg;;-x-me-text-priority:15500;font-size: 12.75;} node|z17[shop=car_repair][service=tyres], area|z17[shop=car_repair][service=tyres] -{icon-image: car-repair-l.svg;font-size: 12.75;} +{icon-image: car-repair-l.svg;font-size: 13.75;} node|z18-[shop=car_repair][service=tyres], area|z18-[shop=car_repair][service=tyres] -{icon-image: car-repair-l.svg;font-size: 13.5;} +{icon-image: car-repair-l.svg;font-size: 14.5;} node|z17[shop=car], area|z17[shop=car] -{icon-image: car_shop-l.svg;icon-min-distance: 24;font-size: 12.75;} +{icon-image: car_shop-l.svg;icon-min-distance: 24;font-size: 13.75;} node|z17[shop=motorcycle], area|z17[shop=motorcycle] -{icon-image: motorcycle_shop-l.svg;icon-min-distance: 24;font-size: 12.75;} +{icon-image: motorcycle_shop-l.svg;icon-min-distance: 24;font-size: 13.75;} node|z17[shop=car_parts], area|z17[shop=car_parts] -{icon-image: car-part-l.svg;icon-min-distance: 24;font-size: 12.75;} +{icon-image: car-part-l.svg;icon-min-distance: 24;font-size: 13.75;} node|z17[shop=car_repair], area|z17[shop=car_repair] -{icon-image: car-repair-l.svg;icon-min-distance: 24;font-size: 12.75;} +{icon-image: car-repair-l.svg;icon-min-distance: 24;font-size: 13.75;} node|z18-[shop=car], area|z18-[shop=car] -{icon-image: car_shop-xl.svg;font-size: 13.5;} +{icon-image: car_shop-xl.svg;font-size: 14.5;} node|z18-[shop=motorcycle], area|z18-[shop=motorcycle] -{icon-image: motorcycle_shop-l.svg;font-size: 13.5;} +{icon-image: motorcycle_shop-l.svg;font-size: 14.5;} node|z18-[shop=car_parts], area|z18-[shop=car_parts] -{icon-image: car-part-xl.svg;font-size: 13.5;} +{icon-image: car-part-xl.svg;font-size: 14.5;} node|z18-[shop=car_repair], area|z18-[shop=car_repair] -{icon-image: car-repair-xl.svg;font-size: 13.5;} +{icon-image: car-repair-xl.svg;font-size: 14.5;} /* 7. CAR */ @@ -921,10 +921,10 @@ area|z16[amenity=fuel] {icon-image: fuel-l.svg;-x-me-text-priority:15500;icon-min-distance: 10;font-size: 12.75;} node|z17[amenity=fuel], area|z17[amenity=fuel] -{icon-image: fuel-l.svg;font-size: 12.75;} +{icon-image: fuel-l.svg;font-size: 13.75;} node|z18-[amenity=fuel], area|z18-[amenity=fuel] -{icon-image: fuel-xl.svg;font-size: 13.5;text:} +{icon-image: fuel-xl.svg;font-size: 14.5;text:} node|z14[amenity=charging_station], area|z14[amenity=charging_station] @@ -937,10 +937,10 @@ area|z16[amenity=charging_station] {icon-image: charging-station-l.svg;-x-me-text-priority:15500;icon-min-distance: 10;font-size: 12.75;} node|z17[amenity=charging_station], area|z17[amenity=charging_station] -{icon-image: charging-station-l.svg; font-size: 12.75;} +{icon-image: charging-station-l.svg; font-size: 13.75;} node|z18-[amenity=charging_station], area|z18-[amenity=charging_station] -{icon-image: charging-station-xl.svg;font-size: 12.75;} +{icon-image: charging-station-xl.svg;font-size: 14.75;} node|z13[highway=speed_camera] {icon-image: speedcam-l.svg; z-index: 75000;} @@ -956,18 +956,18 @@ node|z18-[highway=speed_camera] node|z17[amenity=car_wash], area|z17[amenity=car_wash] -{icon-image: car-wash-l.svg;font-size: 12.75;icon-min-distance: 24;} +{icon-image: car-wash-l.svg;font-size: 13.75;icon-min-distance: 24;} node|z18-[amenity=car_wash], area|z18-[amenity=car_wash ] -{icon-image: car-wash-xl.svg;text-offset: 10;font-size: 13.5;} +{icon-image: car-wash-xl.svg;text-offset: 10;font-size: 14.5;} node|z18-[amenity=car_rental], area|z18-[amenity=car_rental] -{icon-image: car_sharing-xl.svg;text-offset: 10;font-size: 13.5;} +{icon-image: car_sharing-xl.svg;text-offset: 10;font-size: 14.5;} node|z18-[amenity=car_sharing], area|z18-[amenity=car_sharing] -{icon-image: car_sharing-xl.svg;text-offset: 10;font-size: 13.5;} +{icon-image: car_sharing-xl.svg;text-offset: 10;font-size: 14.5;} /* 7.1 Parking */ diff --git a/data/styles/vehicle/include/Roads.mapcss b/data/styles/vehicle/include/Roads.mapcss index c1aa28645b..f7d240d348 100755 --- a/data/styles/vehicle/include/Roads.mapcss +++ b/data/styles/vehicle/include/Roads.mapcss @@ -916,28 +916,33 @@ line|z19-[highway=proposed] /* 8.6 Track & Path 14-22 ZOOM */ -/*line|z14[highway=track][tracktype=grade1], -line|z14[highway=raceway], -line|z14[leisure=track] -{width: 1;} -line|z15[highway=track][tracktype=grade1], -line|z15[highway=raceway], -line|z15[leisure=track] -{width: 1.5;} -line|z16[highway=track][tracktype=grade1], -line|z16[highway=raceway], -line|z16[leisure=track] -{width: 1.8;} -line|z17-18[highway=track][tracktype=grade1], -line|z17-18[highway=raceway], -line|z17-18[leisure=track] -{width:3;} -line|z19-[highway=track][tracktype=grade1], -line|z19-[highway=raceway], -line|z19-[leisure=track] -{width:4;} +line|z14-[highway=track][tracktype=grade1], +line|z14-[psurface=unpaved_good], +line|z14-[psurface=unpaved_bad] +{color: @pedestrian;opacity: 1;} -line|z14[highway=track], +line|z14[highway=track][tracktype=grade1], +line|z14[psurface=unpaved_good], +line|z14[psurface=unpaved_bad] +{width: 1.4;dashes: 2,1.35;} +line|z15[highway=track][tracktype=grade1], +line|z15[psurface=unpaved_good], +line|z15[psurface=unpaved_bad] +{width: 2;dashes: 2.2,1.26;} +line|z16[highway=track][tracktype=grade1], +line|z16[psurface=unpaved_good], +line|z16[psurface=unpaved_bad] +{width: 2.6;dashes: 3.3,1.8;} +line|z17-18[highway=track][tracktype=grade1], +line|z17-18[psurface=unpaved_good], +line|z17-18[psurface=unpaved_bad] +{width: 3;dashes: 4,1.8;} +line|z19-[highway=track][tracktype=grade1], +line|z19-[psurface=unpaved_good], +line|z19-[psurface=unpaved_bad] +{width: 4;dashes: 6.3,2.7;} + +/*line|z14[highway=track], line|z14[highway=path], line|z14[route=hiking] {width:0.9;dashes: 2.52,1.35;} diff --git a/data/styles/vehicle/include/Roads_label.mapcss b/data/styles/vehicle/include/Roads_label.mapcss index 4ed05e61c0..af6950d033 100755 --- a/data/styles/vehicle/include/Roads_label.mapcss +++ b/data/styles/vehicle/include/Roads_label.mapcss @@ -295,39 +295,39 @@ line|z10-11[highway=motorway], line|z10-11[highway=trunk], line|z10-11[highway=motorway_link], line|z10-11[highway=trunk_link] -{font-size: 12;text-color: @label_medium;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;} +{font-size: 13;text-color: @label_medium;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;} line|z12-13[highway=motorway], line|z12-13[highway=trunk], line|z12-13[highway=motorway_link], line|z12-13[highway=trunk_link] -{font-size: 13;text-halo-color: @label_halo_light;} +{font-size: 15;text-halo-color: @label_halo_light;} line|z14-15[highway=motorway], line|z14-15[highway=trunk], -{font-size: 14;text-color: @label_dark;text-halo-opacity: 0.9;} +{font-size: 16;text-color: @label_dark;text-halo-opacity: 0.9;} line|z14[highway=motorway_link], line|z14[highway=trunk_link] -{font-size: 11.5;text-halo-color: @label_halo_medium;} +{font-size: 13.5;text-halo-color: @label_halo_medium;} line|z15[highway=motorway_link], line|z15[highway=trunk_link] -{font-size: 12;text-halo-color: @label_halo_medium;} +{font-size: 14;text-halo-color: @label_halo_medium;} line|z16[highway=trunk], line|z16[highway=motorway], -{font-size: 16.5;text-color: @label_dark;text-halo-opacity: 0.9;} +{font-size: 18.5;text-color: @label_dark;text-halo-opacity: 0.9;} line|z16[highway=motorway_link], line|z16[highway=trunk_link] -{font-size: 13.75;text-halo-opacity: 0.9;} +{font-size: 15.75;text-halo-opacity: 0.9;} line|z17[highway=trunk], line|z17[highway=motorway], -{font-size: 17.5;text-color: @label_dark;text-halo-opacity: 0.99;} +{font-size: 19.5;text-color: @label_dark;text-halo-opacity: 0.99;} line|z17[highway=motorway_link], line|z17[highway=trunk_link] -{font-size: 14;text-halo-opacity: 0.99;} +{font-size: 16;text-halo-opacity: 0.99;} line|z18-[highway=trunk], line|z18-[highway=motorway], -{font-size: 18.5;text-color: @label_dark;text-halo-opacity: 1;} +{font-size: 20.5;text-color: @label_dark;text-halo-opacity: 1;} line|z18-[highway=motorway_link], line|z18-[highway=trunk_link] -{font-size: 14.75;text-halo-opacity: 1;} +{font-size: 16.75;text-halo-opacity: 1;} /* 4.PRIMARY 10-22 ZOOM */ @@ -337,31 +337,31 @@ line|z10-[highway=primary_link], line|z10[highway=primary], line|z10[highway=primary_link] -{font-size: 11.5;text-halo-color: @label_halo_medium;} +{font-size: 12.5;text-halo-color: @label_halo_medium;} line|z11[highway=primary], line|z11[highway=primary_link] -{font-size: 11.5;text-halo-color: @label_halo_medium;} +{font-size: 13.5;text-halo-color: @label_halo_medium;} line|z12-13[highway=primary], line|z12-13[highway=primary_link] -{font-size: 12.75;text-halo-opacity: 0.9;text-halo-color: @label_halo_medium;} +{font-size: 14.75;text-halo-opacity: 0.9;text-halo-color: @label_halo_medium;} line|z14-15[highway=primary], -{font-size: 13.5;text-color: @label_dark;} -line|z14[highway=primary_link] -{font-size: 11;text-halo-color: @label_halo_medium;} -line|z15[highway=primary_link] -{font-size: 11.5;text-halo-color: @label_halo_medium;} -line|z16[highway=primary], {font-size: 15.5;text-color: @label_dark;} +line|z14[highway=primary_link] +{font-size: 13;text-halo-color: @label_halo_medium;} +line|z15[highway=primary_link] +{font-size: 13.5;text-halo-color: @label_halo_medium;} +line|z16[highway=primary], +{font-size: 17.5;text-color: @label_dark;} line|z16[highway=primary_link], -{font-size: 13;} +{font-size: 15;} line|z17[highway=primary], -{font-size: 16.75;text-color: @label_dark;} +{font-size: 18.75;text-color: @label_dark;} line|z17[highway=primary_link], -{font-size: 13.5;} +{font-size: 15.5;} line|z18-[highway=primary], -{font-size: 17;text-color: @label_dark;} +{font-size: 19;text-color: @label_dark;} line|z18-[highway=primary_link], -{font-size: 14.5;text-halo-opacity: 1;} +{font-size: 16.5;text-halo-opacity: 1;} /* 5.SECONDARY 10-22 ZOOM */ @@ -370,22 +370,22 @@ line|z16-[highway=secondary_link] {text: name;text-color: @label_medium;text-halo-opacity: 0.8;text-halo-radius: 1;text-halo-color: @label_halo_medium;} line|z10-11[highway=secondary] -{font-size: 11;text-color: @label_light;} +{font-size: 12;text-color: @label_light;} line|z12-13[highway=secondary] -{font-size: 12;text-color: @label_light;text-halo-opacity: 0.9;text-halo-color: @road_label_halo;} +{font-size: 14;text-color: @label_light;text-halo-opacity: 0.9;text-halo-color: @road_label_halo;} line|z14[highway=secondary], -{font-size: 12.75;} +{font-size: 14.75;} line|z15[highway=secondary], -{font-size: 13.75;} +{font-size: 15.75;} line|z16[highway=secondary], line|z16[highway=secondary_link] -{font-size: 15;text-color: @label_dark;text-halo-color: @label_halo_light;} +{font-size: 17;text-color: @label_dark;text-halo-color: @label_halo_light;} line|z17[highway=secondary], line|z17[highway=secondary_link] -{font-size: 15.75;text-color: @label_dark;text-halo-color: @label_halo_light;} +{font-size: 17.75;text-color: @label_dark;text-halo-color: @label_halo_light;} line|z18-[highway=secondary], line|z18-[highway=secondary_link] -{font-size: 16;text-color: @label_dark;text-halo-opacity: 1;text-halo-color: @label_halo_light;} +{font-size: 18;text-color: @label_dark;text-halo-opacity: 1;text-halo-color: @label_halo_light;} /* 6.RESIDENTAL & TERTIARY 12-22 ZOOM */ @@ -397,24 +397,24 @@ line|z18-[highway=tertiary_link] line|z12-13[highway=residential], line|z12-13[highway=tertiary] -{font-size: 10;text-color: @label_light;text-halo-opacity: 0.9;text-halo-color: @road_label_halo;} +{font-size: 12;text-color: @label_light;text-halo-opacity: 0.9;text-halo-color: @road_label_halo;} line|z14[highway=residential], line|z14[highway=tertiary], -{font-size: 11;} +{font-size: 13;} line|z15[highway=residential], line|z15[highway=tertiary], -{font-size: 12.5;} +{font-size: 14.5;} line|z16[highway=residential], line|z16[highway=tertiary], -{font-size: 13.5;text-halo-color: @label_halo_light;} +{font-size: 15.5;text-halo-color: @label_halo_light;} line|z17[highway=residential], line|z17[highway=tertiary], -{font-size: 14.25;text-halo-color: @label_halo_light;} +{font-size: 16.25;text-halo-color: @label_halo_light;} line|z18-[highway=residential], line|z18-[highway=residential_link], line|z18-[highway=tertiary], line|z18-[highway=tertiary_link] -{font-size: 15;text-halo-opacity: 1;text-halo-color: @label_halo_light;} +{font-size: 17;text-halo-opacity: 1;text-halo-color: @label_halo_light;} /* 7.ROAD, STREETS, UNCLASSIFIED & SERVICE 14-22 ZOOM */ @@ -429,25 +429,25 @@ line|z14[highway=unclassified], line|z14[highway=living_street], line|z14[highway=pedestrian], line|z14[highway=road], -{font-size: 10.5;} +{font-size: 12.5;} line|z15[highway=unclassified], line|z15[highway=living_street], line|z15[highway=pedestrian], line|z15[highway=road], -{font-size: 11.5;} +{font-size: 13.5;} line|z16-17[highway=unclassified], line|z16-17[highway=living_street], -{font-size: 12.5;text-halo-color: @label_halo_light;} +{font-size: 14.5;text-halo-color: @label_halo_light;} line|z16-17[highway=pedestrian], line|z16-17[highway=service], line|z16-17[highway=road], -{font-size: 12.5;text-halo-color: @label_halo_light;} +{font-size: 15.5;text-halo-color: @label_halo_light;} line|z18-[highway=unclassified], line|z18-[highway=living_street], line|z18-[highway=pedestrian], line|z18-[highway=service], line|z18-[highway=road], -{font-size: 13.75;text-halo-opacity: 1;text-halo-color: @label_halo_light;} +{font-size: 15.75;text-halo-opacity: 1;text-halo-color: @label_halo_light;} /* 8.OTHERS ROADS 15-22 ZOOM */ diff --git a/data/visibility.txt b/data/visibility.txt index 40f7186cef..f439154cda 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -313,7 +313,7 @@ world 00000000000000000000 + track 00000000000000000000 + area 00000000000000000000 - bridge 00000000000000000000 - - grade1 00000000000000000000 - + grade1 00000000000000111111 - grade2 00000000000000000000 - grade3 00000000000000000000 + no-access 00000000000000000000 - @@ -624,8 +624,8 @@ world 00000000000000000000 + psurface 00000000000000000000 + paved_bad 00000000000000000000 - paved_good 00000000000000000000 - - unpaved_bad 00000000000000000000 - - unpaved_good 00000000000000000000 - + unpaved_bad 00000000000000111111 - + unpaved_good 00000000000000111111 - {} public_transport 00000000000000000000 + platform 00000000000000000000 - diff --git a/defines.hpp b/defines.hpp index 45dce1ea18..6651afeed3 100644 --- a/defines.hpp +++ b/defines.hpp @@ -67,6 +67,7 @@ #define WORLD_COASTS_OBSOLETE_FILE_NAME "WorldCoasts_obsolete" #define SETTINGS_FILE_NAME "settings.ini" +#define MARKETING_SETTINGS_FILE_NAME "marketing_settings.ini" #define SEARCH_CATEGORIES_FILE_NAME "categories.txt" diff --git a/drape_frontend/route_shape.cpp b/drape_frontend/route_shape.cpp index e9ab669a28..602e30d884 100644 --- a/drape_frontend/route_shape.cpp +++ b/drape_frontend/route_shape.cpp @@ -440,7 +440,9 @@ void RouteShape::CacheRoute(ref_ptr textures, RouteData & ro PrepareGeometry(routeData.m_sourcePolyline.GetPoints(), routeData.m_pivot, segmentsColors, geometry, joinsGeometry, routeData.m_length); - dp::GLState state = dp::GLState(gpu::ROUTE_PROGRAM, dp::GLState::GeometryLayer); + dp::GLState state = + dp::GLState(routeData.m_pattern.m_isDashed ? gpu::ROUTE_DASH_PROGRAM : gpu::ROUTE_PROGRAM, + dp::GLState::GeometryLayer); state.SetColorTexture(textures->GetSymbolsTexture()); BatchGeometry(state, make_ref(geometry.data()), static_cast(geometry.size()), make_ref(joinsGeometry.data()), static_cast(joinsGeometry.size()), diff --git a/drape_frontend/shaders/route_dash.fsh.glsl b/drape_frontend/shaders/route_dash.fsh.glsl index b38cf1fa14..6c162f6730 100644 --- a/drape_frontend/shaders/route_dash.fsh.glsl +++ b/drape_frontend/shaders/route_dash.fsh.glsl @@ -19,7 +19,7 @@ float alphaFromPattern(float curLen, float dashLen, float gapLen) void main() { - vec4 color = u_color; + vec4 color = u_color + v_color; if (v_length.x < v_length.z) { color.a = 0.0; diff --git a/drape_frontend/stylist.cpp b/drape_frontend/stylist.cpp index c1aa1fe69b..39d45dcc91 100644 --- a/drape_frontend/stylist.cpp +++ b/drape_frontend/stylist.cpp @@ -73,7 +73,8 @@ void FilterRulesByRuntimeSelector(FeatureType const & f, int zoomLevel, drule::K keys.erase_if([&f, zoomLevel](drule::Key const & key)->bool { drule::BaseRule const * const rule = drule::rules().Find(key); - ASSERT(rule != nullptr, ()); + if (rule == nullptr) + return true; return !rule->TestFeature(f, zoomLevel); }); } @@ -143,6 +144,9 @@ private: } drule::BaseRule const * const dRule = drule::rules().Find(key); + if (dRule == nullptr) + return; + m_rules.emplace_back(make_pair(dRule, depth)); if (dRule->GetCaption(0) != nullptr) diff --git a/indexer/feature_utils.cpp b/indexer/feature_utils.cpp index 5947948079..ac59409894 100644 --- a/indexer/feature_utils.cpp +++ b/indexer/feature_utils.cpp @@ -12,12 +12,25 @@ #include "base/base.hpp" +#include "std/unordered_map.hpp" +#include "std/utility.hpp" #include "std/vector.hpp" namespace { using StrUtf8 = StringUtf8Multilang; +int8_t GetIndex(string const & lang) +{ + return StrUtf8::GetLangIndex(lang); +} + +unordered_map> const kSimilarToDeviceLanguages = +{ + {GetIndex("be"), {GetIndex("ru")}}, + {GetIndex("ru"), {GetIndex("be")}} +}; + void GetMwmLangName(feature::RegionData const & regionData, StringUtf8Multilang const & src, string & out) { vector mwmLangCodes; @@ -49,14 +62,13 @@ bool GetTransliteratedName(feature::RegionData const & regionData, StringUtf8Mul bool GetBestName(StringUtf8Multilang const & src, vector const & priorityList, string & out) { - auto const priorityListSize = static_cast(priorityList.size()); - auto bestIndex = priorityListSize; + auto bestIndex = priorityList.size(); auto const findAndSet = [](vector const & langs, int8_t const code, string const & name, - long & bestIndex, string & outName) + size_t & bestIndex, string & outName) { auto const it = find(langs.begin(), langs.end(), code); - if (it != langs.end() && bestIndex > distance(langs.begin(), it)) + if (it != langs.end() && bestIndex > static_cast(distance(langs.begin(), it))) { bestIndex = distance(langs.begin(), it); outName = name; @@ -73,13 +85,69 @@ bool GetBestName(StringUtf8Multilang const & src, vector const & priorit }); // There are many "junk" names in Arabian island. - if (bestIndex < priorityListSize && + if (bestIndex < priorityList.size() && priorityList[bestIndex] == StrUtf8::kInternationalCode) { out = out.substr(0, out.find_first_of(',')); } - return bestIndex < priorityListSize; + return bestIndex < priorityList.size(); +} + +vector GetSimilarToDeviceLanguages(int8_t deviceLang) +{ + auto const it = kSimilarToDeviceLanguages.find(deviceLang); + if (it != kSimilarToDeviceLanguages.cend()) + return it->second; + + return {}; +} + +bool IsNativeLang(feature::RegionData const & regionData, int8_t deviceLang) +{ + if (regionData.HasLanguage(deviceLang)) + return true; + + for (auto const lang : GetSimilarToDeviceLanguages(deviceLang)) + { + if (regionData.HasLanguage(lang)) + return true; + } + + return false; +} + +vector MakePrimaryNamePriorityList(int8_t deviceLang, bool preferDefault) +{ + vector langPriority = {deviceLang}; + if (preferDefault) + langPriority.push_back(StrUtf8::kDefaultCode); + + auto const similarLangs = GetSimilarToDeviceLanguages(deviceLang); + langPriority.insert(langPriority.cend(), similarLangs.cbegin(), similarLangs.cend()); + langPriority.insert(langPriority.cend(), {StrUtf8::kInternationalCode, StrUtf8::kEnglishCode}); + + return langPriority; +} + +void GetReadableNameImpl(feature::RegionData const & regionData, StringUtf8Multilang const & src, + int8_t deviceLang, bool preferDefault, bool allowTranslit, string & out) +{ + vector langPriority = MakePrimaryNamePriorityList(deviceLang, preferDefault); + + if (GetBestName(src, langPriority, out)) + return; + + if (allowTranslit && GetTransliteratedName(regionData, src, out)) + return; + + if (!preferDefault) + { + if (GetBestName(src, {StrUtf8::kDefaultCode}, out)) + return; + } + + GetMwmLangName(regionData, src, out); } } // namespace @@ -233,19 +301,16 @@ void GetPreferredNames(RegionData const & regionData, StringUtf8Multilang const return; // When the language of the user is equal to one of the languages of the MWM - // only single name scheme is used. - if (regionData.HasLanguage(deviceLang)) - return GetReadableName(regionData, src, deviceLang, allowTranslit, primary); + // (or similar languages) only single name scheme is used. + if (IsNativeLang(regionData, deviceLang)) + return GetReadableNameImpl(regionData, src, deviceLang, true, allowTranslit, primary); - vector const primaryCodes = {deviceLang, - StrUtf8::kInternationalCode, - StrUtf8::kEnglishCode}; + vector primaryCodes = MakePrimaryNamePriorityList(deviceLang, false); if (!GetBestName(src, primaryCodes, primary) && allowTranslit) GetTransliteratedName(regionData, src, primary); - vector secondaryCodes = {StrUtf8::kDefaultCode, - StrUtf8::kInternationalCode}; + vector secondaryCodes = {StrUtf8::kDefaultCode, StrUtf8::kInternationalCode}; vector mwmLangCodes; regionData.GetLanguages(mwmLangCodes); @@ -269,28 +334,10 @@ void GetReadableName(RegionData const & regionData, StringUtf8Multilang const & if (src.IsEmpty()) return; - vector codes; // If MWM contains user's language. - bool const preferDefault = regionData.HasLanguage(deviceLang); - if (preferDefault) - codes = {deviceLang, StrUtf8::kDefaultCode, StrUtf8::kInternationalCode, StrUtf8::kEnglishCode}; - else - codes = {deviceLang, StrUtf8::kInternationalCode, StrUtf8::kEnglishCode}; + bool const preferDefault = IsNativeLang(regionData, deviceLang); - if (GetBestName(src, codes, out)) - return; - - if (allowTranslit && GetTransliteratedName(regionData, src, out)) - return; - - if (!preferDefault) - { - codes = {StrUtf8::kDefaultCode}; - if (GetBestName(src, codes, out)) - return; - } - - GetMwmLangName(regionData, src, out); + GetReadableNameImpl(regionData, src, deviceLang, preferDefault, allowTranslit, out); } int8_t GetNameForSearchOnBooking(RegionData const & regionData, StringUtf8Multilang const & src, diff --git a/indexer/feature_utils.hpp b/indexer/feature_utils.hpp index 7b91c797d9..8190282351 100644 --- a/indexer/feature_utils.hpp +++ b/indexer/feature_utils.hpp @@ -15,8 +15,11 @@ namespace feature /// Get viewport scale to show given feature. Used in search. int GetFeatureViewportScale(TypesHolder const & types); + /// When the language of the device is equal to one of the languages of the MWM + /// (or similar to device languages) only single name scheme is used. See GetReadableName method. /// Primary name using priority: /// - device language name; + /// - similar to device languages if provided; /// - international name; /// - english name; /// - transliterated name (if allowed). @@ -30,15 +33,19 @@ namespace feature void GetPreferredNames(RegionData const & regionData, StringUtf8Multilang const & src, int8_t const deviceLang, bool allowTranslit, string & primary, string & secondary); - /// When MWM contains user's language, the priority is the following: + /// When MWM contains user's language (or similar to device languages if provided), + /// the priority is the following: /// - device language name; /// - default name; + /// - similar to device languages if provided; /// - international name; /// - english name; /// - transliterated name (if allowed); /// - country language name. - /// When MWM does not contain user's language, the priority is the following: + /// When MWM does not contain user's language (or similar to device languages), + /// the priority is the following: /// - device language name; + /// - similar to device languages if provided; /// - international name; /// - english name; /// - transliterated name (if allowed); diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp index 30718a76ae..aedb052684 100644 --- a/indexer/ftypes_matcher.cpp +++ b/indexer/ftypes_matcher.cpp @@ -362,6 +362,18 @@ IsBookingChecker const & IsBookingChecker::Instance() return inst; } +IsTinkoffChecker::IsTinkoffChecker() +{ + Classificator const & c = classif(); + m_types.push_back(c.GetTypeByPath({"sponsored", "tinkoff"})); +} + +IsTinkoffChecker const & IsTinkoffChecker::Instance() +{ + static IsTinkoffChecker const inst; + return inst; +} + IsHotelChecker::IsHotelChecker() { Classificator const & c = classif(); diff --git a/indexer/ftypes_matcher.hpp b/indexer/ftypes_matcher.hpp index 2c42cd1f22..2e4e3c9454 100644 --- a/indexer/ftypes_matcher.hpp +++ b/indexer/ftypes_matcher.hpp @@ -152,6 +152,13 @@ public: static IsBookingChecker const & Instance(); }; +class IsTinkoffChecker : public BaseChecker +{ + IsTinkoffChecker(); +public: + static IsTinkoffChecker const & Instance(); +}; + class IsHotelChecker : public BaseChecker { public: diff --git a/indexer/indexer_tests/feature_names_test.cpp b/indexer/indexer_tests/feature_names_test.cpp index 282513d8c5..52f742dc3e 100644 --- a/indexer/indexer_tests/feature_names_test.cpp +++ b/indexer/indexer_tests/feature_names_test.cpp @@ -167,6 +167,62 @@ UNIT_TEST(GetPrefferedNames) TEST_EQUAL(primary, "en name", ()); TEST_EQUAL(secondary, "", ()); } + { + int8_t deviceLang = StrUtf8::GetLangIndex("ru"); + StrUtf8 src; + src.AddString("int_name", "int name"); + src.AddString("en", "en name"); + src.AddString("be", "be name"); + + feature::GetPreferredNames(regionData, src, deviceLang, allowTranslit, primary, secondary); + + TEST_EQUAL(primary, "be name", ()); + TEST_EQUAL(secondary, "int name", ()); + } + { + feature::RegionData regionData; + regionData.SetLanguages({"ru"}); + int8_t deviceLang = StrUtf8::GetLangIndex("be"); + StrUtf8 src; + src.AddString("int_name", "int name"); + src.AddString("en", "en name"); + src.AddString("ru", "ru name"); + + feature::GetPreferredNames(regionData, src, deviceLang, allowTranslit, primary, secondary); + + TEST_EQUAL(primary, "ru name", ()); + TEST_EQUAL(secondary, "", ()); + } + { + feature::RegionData regionData; + regionData.SetLanguages({"ru"}); + int8_t deviceLang = StrUtf8::GetLangIndex("be"); + StrUtf8 src; + src.AddString("default", "default name"); + src.AddString("int_name", "int name"); + src.AddString("en", "en name"); + src.AddString("ru", "ru name"); + + feature::GetPreferredNames(regionData, src, deviceLang, allowTranslit, primary, secondary); + + TEST_EQUAL(primary, "default name", ()); + TEST_EQUAL(secondary, "", ()); + } + { + feature::RegionData regionData; + regionData.SetLanguages({"ru"}); + int8_t deviceLang = StrUtf8::GetLangIndex("ru"); + StrUtf8 src; + src.AddString("default", "default name"); + src.AddString("int_name", "int name"); + src.AddString("en", "en name"); + src.AddString("be", "be name"); + + feature::GetPreferredNames(regionData, src, deviceLang, allowTranslit, primary, secondary); + + TEST_EQUAL(primary, "default name", ()); + TEST_EQUAL(secondary, "", ()); + } } UNIT_TEST(GetPrefferedNamesLocal) @@ -188,6 +244,18 @@ UNIT_TEST(GetPrefferedNamesLocal) TEST_EQUAL(primary, "default name", ()); TEST_EQUAL(secondary, "", ()); } + { + int8_t deviceLang = StrUtf8::GetLangIndex("ru"); + StrUtf8 src; + src.AddString("int_name", "int name"); + src.AddString("en", "en name"); + src.AddString("be", "be name"); + + feature::GetPreferredNames(regionData, src, deviceLang, allowTranslit, primary, secondary); + + TEST_EQUAL(primary, "be name", ()); + TEST_EQUAL(secondary, "", ()); + } } UNIT_TEST(GetReadableName) @@ -333,6 +401,45 @@ UNIT_TEST(GetReadableName) TEST_EQUAL(name, "ko name", ()); } + { + int8_t deviceLang = StrUtf8::GetLangIndex("be"); + StrUtf8 src; + src.AddString("int_name", "int name"); + src.AddString("en", "en name"); + src.AddString("ru", "ru name"); + + feature::GetReadableName(regionData, src, deviceLang, allowTranslit, name); + + TEST_EQUAL(name, "ru name", ()); + } + { + feature::RegionData regionData; + regionData.SetLanguages({"ru"}); + int8_t deviceLang = StrUtf8::GetLangIndex("be"); + StrUtf8 src; + src.AddString("default", "default name"); + src.AddString("int_name", "int name"); + src.AddString("en", "en name"); + src.AddString("ru", "ru name"); + + feature::GetReadableName(regionData, src, deviceLang, allowTranslit, name); + + TEST_EQUAL(name, "default name", ()); + } + { + feature::RegionData regionData; + regionData.SetLanguages({"ru"}); + int8_t deviceLang = StrUtf8::GetLangIndex("ru"); + StrUtf8 src; + src.AddString("default", "default name"); + src.AddString("int_name", "int name"); + src.AddString("en", "en name"); + src.AddString("be", "be name"); + + feature::GetReadableName(regionData, src, deviceLang, allowTranslit, name); + + TEST_EQUAL(name, "default name", ()); + } } UNIT_TEST(GetNameForSearchOnBooking) diff --git a/indexer/indexer_tests/osm_editor_test.cpp b/indexer/indexer_tests/osm_editor_test.cpp index b0df3afaa9..32790b9d58 100644 --- a/indexer/indexer_tests/osm_editor_test.cpp +++ b/indexer/indexer_tests/osm_editor_test.cpp @@ -655,7 +655,10 @@ void EditorTest::HaveMapEditsOrNotesToUploadTest() ForEachCafeAtPoint(m_index, m2::PointD(1.0, 1.0), [&editor](FeatureType & ft) { using NoteType = osm::Editor::NoteProblemType; - editor.CreateNote({1.0, 1.0}, ft.GetID(), NoteType::PlaceDoesNotExist, "exploded"); + feature::TypesHolder typesHolder; + string defaultName; + editor.CreateNote({1.0, 1.0}, ft.GetID(), typesHolder, defaultName, NoteType::PlaceDoesNotExist, + "exploded"); }); TEST(editor.HaveMapEditsOrNotesToUpload(), ()); @@ -828,13 +831,18 @@ void EditorTest::CreateNoteTest() { platform::tests_support::ScopedFile sf("test_notes.xml"); editor.m_notes = Notes::MakeNotes(sf.GetFullPath(), true); - editor.CreateNote(pos, fId, noteType, "with comment"); + feature::TypesHolder holder; + holder.Assign(classif().GetTypeByPath({"amenity", "restaurant"})); + string defaultName = "Test name"; + editor.CreateNote(pos, fId, holder, defaultName, noteType, "with comment"); auto notes = editor.m_notes->GetNotes(); TEST_EQUAL(notes.size(), 1, ()); TEST(notes.front().m_point.EqualDxDy(pos, 1e-10), ()); TEST_NOT_EQUAL(notes.front().m_note.find("with comment"), string::npos, ()); TEST_NOT_EQUAL(notes.front().m_note.find("OSM data version"), string::npos, ()); + TEST_NOT_EQUAL(notes.front().m_note.find("restaurant"), string::npos, ()); + TEST_NOT_EQUAL(notes.front().m_note.find("Test name"), string::npos, ()); }; ForEachCafeAtPoint(m_index, m2::PointD(1.0, 1.0), [&editor, &createAndCheckNote](FeatureType & ft) diff --git a/indexer/osm_editor.cpp b/indexer/osm_editor.cpp index db2059c20e..b3d1e0d0c7 100644 --- a/indexer/osm_editor.cpp +++ b/indexer/osm_editor.cpp @@ -1073,6 +1073,7 @@ bool Editor::CreatePoint(uint32_t type, m2::PointD const & mercator, MwmSet::Mwm } void Editor::CreateNote(ms::LatLon const & latLon, FeatureID const & fid, + feature::TypesHolder const & holder, string const & defaultName, NoteProblemType const type, string const & note) { auto const version = GetMwmCreationTimeByMwmId(fid.m_mwmId); @@ -1080,13 +1081,14 @@ void Editor::CreateNote(ms::LatLon const & latLon, FeatureID const & fid, ostringstream sstr; auto canCreate = true; + if (!note.empty()) + sstr << "\"" << note << "\"" << endl; + switch (type) { case NoteProblemType::PlaceDoesNotExist: { - sstr << kPlaceDoesNotExistMessage; - if (!note.empty()) - sstr << " User comments: \"" << note << '\"'; + sstr << kPlaceDoesNotExistMessage << endl; auto const isCreated = GetFeatureStatus(fid) == FeatureStatus::Created; auto const createdAndUploaded = (isCreated && IsFeatureUploaded(fid.m_mwmId, fid.m_index)); CHECK(!isCreated || createdAndUploaded, ()); @@ -1098,13 +1100,22 @@ void Editor::CreateNote(ms::LatLon const & latLon, FeatureID const & fid, break; } - case NoteProblemType::General: - { - sstr << note; - break; - } + case NoteProblemType::General: break; } - sstr << " (OSM data version: " << stringVersion << ')'; + + if (defaultName.empty()) + sstr << "POI has no name" << endl; + else + sstr << "POI name: " << defaultName << endl; + + sstr << "POI types:"; + for (auto const & type : holder.ToObjectNames()) + { + sstr << ' ' << type; + } + sstr << endl; + + sstr << "OSM data version: " << stringVersion << endl; if (canCreate) m_notes->CreateNote(latLon, sstr.str()); diff --git a/indexer/osm_editor.hpp b/indexer/osm_editor.hpp index 2042727ec8..daa620dd4e 100644 --- a/indexer/osm_editor.hpp +++ b/indexer/osm_editor.hpp @@ -180,6 +180,7 @@ public: }; void CreateNote(ms::LatLon const & latLon, FeatureID const & fid, + feature::TypesHolder const & holder, string const & defaultName, NoteProblemType const type, string const & note); void UploadNotes(string const & key, string const & secret); diff --git a/iphone/Maps/Bookmarks/BookmarksRootVC.mm b/iphone/Maps/Bookmarks/BookmarksRootVC.mm index 6e4375c813..f4d7b37bea 100644 --- a/iphone/Maps/Bookmarks/BookmarksRootVC.mm +++ b/iphone/Maps/Bookmarks/BookmarksRootVC.mm @@ -9,6 +9,10 @@ #define TEXTFIELD_TAG 999 +extern NSString * const kBookmarkCategoryDeletedNotification = + @"BookmarkCategoryDeletedNotification"; + + @implementation BookmarksRootVC - (id)init @@ -235,7 +239,7 @@ if (editingStyle == UITableViewCellEditingStyleDelete) { [Statistics logEvent:kStatEventName(kStatPlacePage, kStatRemove)]; - [[NSNotificationCenter defaultCenter] postNotificationName:BOOKMARK_CATEGORY_DELETED_NOTIFICATION object:@(indexPath.row)]; + [[NSNotificationCenter defaultCenter] postNotificationName:kBookmarkCategoryDeletedNotification object:@(indexPath.row)]; Framework & f = GetFramework(); f.DeleteBmCategory(indexPath.row); [self.tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationFade]; diff --git a/iphone/Maps/Bookmarks/BookmarksVC.mm b/iphone/Maps/Bookmarks/BookmarksVC.mm index f05e93a9c3..38077219de 100644 --- a/iphone/Maps/Bookmarks/BookmarksVC.mm +++ b/iphone/Maps/Bookmarks/BookmarksVC.mm @@ -22,11 +22,15 @@ #include "coding/zip_creator.hpp" #include "coding/internal/file_data.hpp" +#include +#include + #define PINDIAMETER 18 #define EMPTY_SECTION -666 extern NSString * const kBookmarksChangedNotification = @"BookmarksChangedNotification"; +extern NSString * const kBookmarkDeletedNotification = @"BookmarkDeletedNotification"; @interface BookmarksVC() { @@ -295,9 +299,9 @@ extern NSString * const kBookmarksChangedNotification = @"BookmarksChangedNotifi } else { - BookmarkAndCategory bookmarkAndCategory{static_cast(indexPath.row), m_categoryIndex}; - NSValue * value = [NSValue valueWithBytes:&bookmarkAndCategory objCType:@encode(BookmarkAndCategory)]; - [[NSNotificationCenter defaultCenter] postNotificationName:BOOKMARK_DELETED_NOTIFICATION object:value]; + auto bac = BookmarkAndCategory(static_cast(indexPath.row), m_categoryIndex); + NSValue * value = [NSValue valueWithBytes:&bac objCType:@encode(BookmarkAndCategory)]; + [[NSNotificationCenter defaultCenter] postNotificationName:kBookmarkDeletedNotification object:value]; BookmarkCategory::Guard guard(*cat); guard.m_controller.DeleteUserMark(indexPath.row); [NSNotificationCenter.defaultCenter postNotificationName:kBookmarksChangedNotification @@ -409,7 +413,16 @@ extern NSString * const kBookmarksChangedNotification = @"BookmarksChangedNotifi MWMMailViewController * mailVC = [[MWMMailViewController alloc] init]; mailVC.mailComposeDelegate = self; [mailVC setSubject:L(@"share_bookmarks_email_subject")]; - NSData * myData = [[NSData alloc] initWithContentsOfFile:filePath]; + + std::ifstream ifs(filePath.UTF8String); + ifs.seekg(ifs.end); + auto const size = ifs.tellg(); + std::vector data(size); + ifs.seekg(ifs.beg); + ifs.read(data.data(), size); + ifs.close(); + + auto myData = [[NSData alloc] initWithBytes:data.data() length:size]; [mailVC addAttachmentData:myData mimeType:mimeType fileName:[NSString stringWithFormat:@"%@%@", catName, fileExtension]]; [mailVC setMessageBody:[NSString stringWithFormat:L(@"share_bookmarks_email_body"), catName] isHTML:NO]; [self presentViewController:mailVC animated:YES completion:nil]; diff --git a/iphone/Maps/Classes/Components/BorderedButton.swift b/iphone/Maps/Classes/Components/BorderedButton.swift index 6ea3cf842f..f10e5a4694 100644 --- a/iphone/Maps/Classes/Components/BorderedButton.swift +++ b/iphone/Maps/Classes/Components/BorderedButton.swift @@ -19,11 +19,11 @@ final class BorderedButton: UIButton { private func updateBorder() { if !isEnabled { - layer.borderColor = borderDisabledColor?.cgColor + layer.borderColor = borderDisabledColor?.cgColor ?? titleColor(for: .disabled)?.cgColor } else if isHighlighted { - layer.borderColor = borderHighlightedColor?.cgColor + layer.borderColor = borderHighlightedColor?.cgColor ?? titleColor(for: .highlighted)?.cgColor } else { - layer.borderColor = borderColor?.cgColor + layer.borderColor = borderColor?.cgColor ?? titleColor(for: .normal)?.cgColor } } diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm index 263106b0bd..88a2803fe8 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm @@ -129,10 +129,13 @@ extern NSString * const kAlohalyticsTapEventKey; { [self.trafficButton viewWillTransitionToSize:size withTransitionCoordinator:coordinator]; [self.menuController viewWillTransitionToSize:size withTransitionCoordinator:coordinator]; - // Workaround needs for setting correct left bound while landscape place page is open. - self.navigationManager.leftBound = 0; [self.placePageManager viewWillTransitionToSize:size withTransitionCoordinator:coordinator]; [self.searchManager viewWillTransitionToSize:size withTransitionCoordinator:coordinator]; + [coordinator animateAlongsideTransition:^( + id _Nonnull context) { + self.navigationManager.leftBound = self.leftBound; + } + completion:nil]; } #pragma mark - MWMPlacePageViewManager diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index 601ed253a6..55a8138eaa 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -256,6 +256,7 @@ using namespace osm_auth_ios; break; } + case ParsedMapApi::ParsingResult::Lead: break; } } else if (m_fileURL) diff --git a/iphone/Maps/Common/MWMConsts.h b/iphone/Maps/Common/MWMConsts.h index e2d1e45f33..7f6ef5c2e3 100644 --- a/iphone/Maps/Common/MWMConsts.h +++ b/iphone/Maps/Common/MWMConsts.h @@ -1,8 +1,3 @@ -static NSString * const BOOKMARK_CATEGORY_DELETED_NOTIFICATION = - @"BookmarkCategoryDeletedNotification"; - -static NSString * const BOOKMARK_DELETED_NOTIFICATION = @"BookmarkDeletedNotification"; - static NSString * const kMapsmeErrorDomain = @"com.mapsme.error"; static NSTimeInterval const kDefaultAnimationDuration = .2; diff --git a/iphone/Maps/Core/Ads/BannersCache.swift b/iphone/Maps/Core/Ads/BannersCache.swift index 14fcecb9d1..de12ca0fec 100644 --- a/iphone/Maps/Core/Ads/BannersCache.swift +++ b/iphone/Maps/Core/Ads/BannersCache.swift @@ -22,29 +22,28 @@ final class BannersCache: NSObject { private func onCompletion(isAsync: Bool) { guard let completion = completion else { return } - var bannerType: BannerType? + var banner: Banner? statesLoop: for loadState in loadStates { switch loadState { - case .notLoaded(_): return + case .notLoaded(let type): + banner = cache[type] + break statesLoop case .loaded(let type): - bannerType = type + banner = cache[type] break statesLoop case .error: continue } } - guard bannerType != nil else { return } - guard let banner = cache[bannerType!] else { - assert(false) - return + if let banner = banner { + Statistics.logEvent(kStatPlacePageBannerShow, withParameters: banner.statisticsDescription) + MRMyTracker.trackEvent(withName: kStatPlacePageBannerShow) + completion(banner, isAsync) + banner.isBannerOnScreen = true + self.completion = nil } - Statistics.logEvent(kStatPlacePageBannerShow, withParameters: banner.statisticsDescription) - MRMyTracker.trackEvent(withName: kStatPlacePageBannerShow) - completion(banner, isAsync) - banner.isBannerOnScreen = true - self.completion = nil } - func get(coreBanners: [CoreBanner], completion: @escaping Completion, cacheOnly: Bool) { + func get(coreBanners: [CoreBanner], cacheOnly: Bool, loadNew: Bool = true, completion: @escaping Completion) { self.completion = completion self.cacheOnly = cacheOnly loadStates = coreBanners.map { coreBanner in @@ -52,10 +51,13 @@ final class BannersCache: NSObject { if let banner = cache[bannerType], (!banner.isPossibleToReload || banner.isNeedToRetain) { return .loaded(bannerType) } else { - get(bannerType: bannerType) + if loadNew { + get(bannerType: bannerType) + } return .notLoaded(bannerType) } } + onCompletion(isAsync: false) } diff --git a/iphone/Maps/Core/Location/MWMLocationHelpers.h b/iphone/Maps/Core/Location/MWMLocationHelpers.h index a676ac9410..f37f022855 100644 --- a/iphone/Maps/Core/Location/MWMLocationHelpers.h +++ b/iphone/Maps/Core/Location/MWMLocationHelpers.h @@ -1,4 +1,5 @@ #import "MWMLocationManager.h" +#import "SwiftBridge.h" #include "platform/location.hpp" #include "platform/measurement_utils.hpp" @@ -8,60 +9,26 @@ namespace location_helpers { -static inline char const * getSpeedSymbol(CLLocationSpeed const & metersPerSecond) -{ - // 0-1 m/s - static char const * turtle = "\xF0\x9F\x90\xA2 "; - // 1-2 m/s - static char const * pedestrian = "\xF0\x9F\x9A\xB6 "; - // 2-5 m/s - static char const * tractor = "\xF0\x9F\x9A\x9C "; - // 5-10 m/s - static char const * bicycle = "\xF0\x9F\x9A\xB2 "; - // 10-36 m/s - static char const * car = "\xF0\x9F\x9A\x97 "; - // 36-120 m/s - static char const * train = "\xF0\x9F\x9A\x85 "; - // 120-278 m/s - static char const * airplane = "\xE2\x9C\x88\xEF\xB8\x8F "; - // 278+ - static char const * rocket = "\xF0\x9F\x9A\x80 "; - - if (metersPerSecond <= 1.) - return turtle; - else if (metersPerSecond <= 2.) - return pedestrian; - else if (metersPerSecond <= 5.) - return tractor; - else if (metersPerSecond <= 10.) - return bicycle; - else if (metersPerSecond <= 36.) - return car; - else if (metersPerSecond <= 120.) - return train; - else if (metersPerSecond <= 278.) - return airplane; - else - return rocket; -} static inline NSString * formattedSpeedAndAltitude(CLLocation * location) { if (!location) return nil; - string result; + NSMutableString * result = [@"" mutableCopy]; if (location.altitude) - result = "\xE2\x96\xB2 " /* this is simple mountain symbol */ + - measurement_utils::FormatAltitude(location.altitude); + [result appendString:[NSString stringWithFormat:@"%@ %@", @"\xE2\x96\xB2", @(measurement_utils::FormatAltitude(location.altitude).c_str())]]; + // Speed is actual only for just received location if (location.speed > 0. && [location.timestamp timeIntervalSinceNow] >= -2.0) { - if (!result.empty()) - result += " "; - result += getSpeedSymbol(location.speed) + - measurement_utils::FormatSpeedWithDeviceUnits(location.speed); + if (result.length) + [result appendString:@" "]; + + [result appendString:[NSString stringWithFormat:@"%@%@", + [MWMLocationManager speedSymbolFor:location.speed], + @(measurement_utils::FormatSpeedWithDeviceUnits(location.speed).c_str())]]; } - return result.empty() ? nil : @(result.c_str()); + return result; } static inline NSString * formattedDistance(double const & meters) diff --git a/iphone/Maps/Core/Location/MWMLocationManager+SpeedAndAltitude.swift b/iphone/Maps/Core/Location/MWMLocationManager+SpeedAndAltitude.swift new file mode 100644 index 0000000000..f3f65129f8 --- /dev/null +++ b/iphone/Maps/Core/Location/MWMLocationManager+SpeedAndAltitude.swift @@ -0,0 +1,15 @@ +extension MWMLocationManager { + + static func speedSymbolFor(_ speed: Double) -> String { + switch max(speed, 0) { + case 0..<1: return "🐢" + case 1..<2: return "🚶" + case 2..<5: return "🏃" + case 5..<10: return "🚲" + case 10..<36: return "🚗" + case 36..<120: return "🚄" + case 120..<278: return "🛩" + default: return "🚀" + } + } +} diff --git a/iphone/Maps/Core/Location/MWMLocationManager.mm b/iphone/Maps/Core/Location/MWMLocationManager.mm index 5a9b2b4409..07f7cd26ff 100644 --- a/iphone/Maps/Core/Location/MWMLocationManager.mm +++ b/iphone/Maps/Core/Location/MWMLocationManager.mm @@ -341,6 +341,7 @@ void setPermissionRequested() case routing::RouterType::Pedestrian: manager.geoMode = GeoMode::PedestrianRouting; break; case routing::RouterType::Bicycle: manager.geoMode = GeoMode::BicycleRouting; break; case routing::RouterType::Taxi: break; + case routing::RouterType::Count: NSAssert(false, @"Incorrect state"); break; } } else diff --git a/iphone/Maps/Core/Search/MWMSearch.mm b/iphone/Maps/Core/Search/MWMSearch.mm index df3b13c15d..5507940f03 100644 --- a/iphone/Maps/Core/Search/MWMSearch.mm +++ b/iphone/Maps/Core/Search/MWMSearch.mm @@ -101,6 +101,7 @@ using TObservers = NSHashTable<__kindof TObserver>; f.SearchInViewport(m_viewportParams); } } + [self updateItemsIndexWithBannerReload:YES]; [self onSearchCompleted]; } else @@ -108,7 +109,7 @@ using TObservers = NSHashTable<__kindof TObserver>; self->m_everywhereResults = results; self->m_isLocalAdsCustomer = isLocalAdsCustomer; self.suggestionsCount = results.GetSuggestsCount(); - [self updateItemsIndex]; + [self updateItemsIndexWithBannerReload:NO]; [self onSearchResultsUpdated]; } }; @@ -256,7 +257,7 @@ using TObservers = NSHashTable<__kindof TObserver>; auto manager = [MWMSearch manager]; manager->m_everywhereResults.Clear(); manager.suggestionsCount = 0; - [manager updateItemsIndex]; + [manager updateItemsIndexWithBannerReload:YES]; [self reset]; } @@ -296,7 +297,7 @@ using TObservers = NSHashTable<__kindof TObserver>; [manager onSearchCompleted]; } -- (void)updateItemsIndex +- (void)updateItemsIndexWithBannerReload:(BOOL)reloadBanner { auto const resultsCount = self->m_everywhereResults.GetCount(); auto const itemsIndex = [[MWMSearchIndex alloc] initWithSuggestionsCount:self.suggestionsCount @@ -311,14 +312,15 @@ using TObservers = NSHashTable<__kindof TObserver>; __weak auto weakSelf = self; [bannersCache getWithCoreBanners:banner_helpers::MatchPriorityBanners(adsEngine.GetSearchBanners()) + cacheOnly:YES + loadNew:reloadBanner completion:^(id ad, BOOL isAsync) { __strong auto self = weakSelf; if (!self) return; NSAssert(isAsync == NO, @"Banner is not from cache!"); [self.banners add:ad]; - } - cacheOnly:YES]; + }]; } } else diff --git a/iphone/Maps/Core/Search/MWMSearchItemType.h b/iphone/Maps/Core/Search/MWMSearchItemType.h index d48be1c761..77bd68e899 100644 --- a/iphone/Maps/Core/Search/MWMSearchItemType.h +++ b/iphone/Maps/Core/Search/MWMSearchItemType.h @@ -2,5 +2,6 @@ typedef NS_ENUM(NSUInteger, MWMSearchItemType) { // Order == priority. MWMSearchItemTypeRegular, MWMSearchItemTypeMopub, + MWMSearchItemTypeFacebook, MWMSearchItemTypeSuggestion }; diff --git a/iphone/Maps/Core/Search/SearchBanners.swift b/iphone/Maps/Core/Search/SearchBanners.swift index cbbec06cb9..815dd4e5e6 100644 --- a/iphone/Maps/Core/Search/SearchBanners.swift +++ b/iphone/Maps/Core/Search/SearchBanners.swift @@ -18,6 +18,9 @@ final class SearchBanners: NSObject { case .mopub: type = .mopub prefferedPosition = 2 + case .facebook: + type = .facebook + prefferedPosition = 2 default: assert(false, "Unsupported banner type") type = .regular diff --git a/iphone/Maps/Core/Storage/MWMStorage.mm b/iphone/Maps/Core/Storage/MWMStorage.mm index fb3d2374dc..25b2e108fc 100644 --- a/iphone/Maps/Core/Storage/MWMStorage.mm +++ b/iphone/Maps/Core/Storage/MWMStorage.mm @@ -81,17 +81,17 @@ using namespace storage; } + (void)downloadNodes:(TCountriesVec const &)countryIds onSuccess:(MWMVoidBlock)onSuccess { - TMwmSize requiredSize = accumulate(countryIds.begin(), countryIds.end(), kMaxMwmSizeBytes, + auto & s = GetFramework().GetStorage(); + TMwmSize requiredSize = accumulate(countryIds.begin(), countryIds.end(), s.GetMaxMwmSizeBytes(), [](size_t const & size, TCountryId const & countryId) { NodeAttrs nodeAttrs; GetFramework().GetStorage().GetNodeAttrs(countryId, nodeAttrs); - return size + nodeAttrs.m_mwmSize - nodeAttrs.m_localMwmSize; + return size + nodeAttrs.m_mwmSize; }); - if (GetPlatform().GetWritableStorageStatus(requiredSize) == Platform::TStorageStatus::STORAGE_OK) + if (storage::IsEnoughSpaceForDownload(requiredSize)) { - [self checkConnectionAndPerformAction:[countryIds, onSuccess] { - auto & s = GetFramework().GetStorage(); + [self checkConnectionAndPerformAction:[countryIds, onSuccess, &s] { for (auto const & countryId : countryIds) s.DownloadNode(countryId); if (onSuccess) diff --git a/iphone/Maps/Images.xcassets/Whats New/wn_img_1.imageset/Contents.json b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_driving_style.imageset/Contents.json similarity index 62% rename from iphone/Maps/Images.xcassets/Whats New/wn_img_1.imageset/Contents.json rename to iphone/Maps/Images.xcassets/Whats New/img_whatsnew_driving_style.imageset/Contents.json index cfedf9f15f..15ecbf5eaa 100644 --- a/iphone/Maps/Images.xcassets/Whats New/wn_img_1.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_driving_style.imageset/Contents.json @@ -2,17 +2,17 @@ "images" : [ { "idiom" : "universal", - "filename" : "wn_img_1.png", + "filename" : "img_whatsnew_driving_style.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "wn_img_1@2x.png", + "filename" : "img_whatsnew_driving_style@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "wn_img_1@3x.png", + "filename" : "img_whatsnew_driving_style@3x.png", "scale" : "3x" } ], diff --git a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_driving_style.imageset/img_whatsnew_driving_style.png b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_driving_style.imageset/img_whatsnew_driving_style.png new file mode 100644 index 0000000000..9ade1afaf3 Binary files /dev/null and b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_driving_style.imageset/img_whatsnew_driving_style.png differ diff --git a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_driving_style.imageset/img_whatsnew_driving_style@2x.png b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_driving_style.imageset/img_whatsnew_driving_style@2x.png new file mode 100644 index 0000000000..cacfd45caf Binary files /dev/null and b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_driving_style.imageset/img_whatsnew_driving_style@2x.png differ diff --git a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_driving_style.imageset/img_whatsnew_driving_style@3x.png b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_driving_style.imageset/img_whatsnew_driving_style@3x.png new file mode 100644 index 0000000000..3baaad7aaf Binary files /dev/null and b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_driving_style.imageset/img_whatsnew_driving_style@3x.png differ diff --git a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_transliteration.imageset/Contents.json b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_transliteration.imageset/Contents.json new file mode 100644 index 0000000000..38124679ab --- /dev/null +++ b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_transliteration.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "img_whatsnew_transliteration.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "img_whatsnew_transliteration@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "img_whatsnew_transliteration@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_transliteration.imageset/img_whatsnew_transliteration.png b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_transliteration.imageset/img_whatsnew_transliteration.png new file mode 100644 index 0000000000..0e25aefeb9 Binary files /dev/null and b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_transliteration.imageset/img_whatsnew_transliteration.png differ diff --git a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_transliteration.imageset/img_whatsnew_transliteration@2x.png b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_transliteration.imageset/img_whatsnew_transliteration@2x.png new file mode 100644 index 0000000000..8123006f07 Binary files /dev/null and b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_transliteration.imageset/img_whatsnew_transliteration@2x.png differ diff --git a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_transliteration.imageset/img_whatsnew_transliteration@3x.png b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_transliteration.imageset/img_whatsnew_transliteration@3x.png new file mode 100644 index 0000000000..f7d6ea9492 Binary files /dev/null and b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_transliteration.imageset/img_whatsnew_transliteration@3x.png differ diff --git a/iphone/Maps/Images.xcassets/Whats New/wn_img_1.imageset/wn_img_1.png b/iphone/Maps/Images.xcassets/Whats New/wn_img_1.imageset/wn_img_1.png deleted file mode 100644 index edeba2cbd7..0000000000 Binary files a/iphone/Maps/Images.xcassets/Whats New/wn_img_1.imageset/wn_img_1.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Whats New/wn_img_1.imageset/wn_img_1@2x.png b/iphone/Maps/Images.xcassets/Whats New/wn_img_1.imageset/wn_img_1@2x.png deleted file mode 100644 index 4c84b7f2b7..0000000000 Binary files a/iphone/Maps/Images.xcassets/Whats New/wn_img_1.imageset/wn_img_1@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Whats New/wn_img_1.imageset/wn_img_1@3x.png b/iphone/Maps/Images.xcassets/Whats New/wn_img_1.imageset/wn_img_1@3x.png deleted file mode 100644 index 1efa510956..0000000000 Binary files a/iphone/Maps/Images.xcassets/Whats New/wn_img_1.imageset/wn_img_1@3x.png and /dev/null differ diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings index 583a2e4e23..3bab91a1ed 100644 --- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings @@ -473,14 +473,6 @@ /* Settings information group in settings screen */ "prefs_group_information" = "Information"; -/* Settings languages information in voice instructions screen */ -"prefs_languages_information" = "Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.)."; - -/* Settings languages off information in voice instructions screen */ -"prefs_languages_information_off" = "For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine."; - -"prefs_languages_information_off_link" = "For more information please check the guide."; - /* Settings screen: "Map" category title */ "prefs_group_map" = "الخريطة"; @@ -634,9 +626,6 @@ /* Settings: Send feedback button and dialog title */ "feedback" = "تعقيب"; -/* Settings: "Send general feedback" button */ -"feedback_general" = "General Feedback"; - /* Text in menu */ "subscribe_to_news" = "أشترك في نشرتنا الإخبارية"; @@ -1666,7 +1655,8 @@ "booking_filters_reset" = "إعادة تعيين"; -"booking_filters_rating" = "تصنيف"; +/* Beginning from a particular value and */ +"booking_filters_rating" = "تصنيف من"; "booking_filters_rating_any" = "أي"; @@ -1714,7 +1704,8 @@ "dialog_taxi_error" = "طلب تاكسي غير متاح مؤقتا."; -"advertisement" = "إعلان"; +/* Abbreviated for all languages. */ +"advertisement" = "AD"; "mobile_data_dialog" = "استخدام إنترنت المحمول لإظهار المعلومات التفصيلية؟"; @@ -1861,15 +1852,15 @@ "booking_search" = "Booking.com"; -"whats_new_auto_update_updating_maps" = "Updating maps"; +"whats_new_auto_update_updating_maps" = "تحديث الخرائط"; -"whats_new_auto_update_title" = "Update your downloaded maps"; +"whats_new_auto_update_title" = "قم بتحديث الخرائط التي قمت بنتزيلها"; -"whats_new_auto_update_message" = "Update maps supports information about objects in the current state"; +"whats_new_auto_update_message" = "تحديث الخرائط والاحتفاظ بالمعلومات حول الكائنات محدثة"; -"whats_new_auto_update_button_size" = "Update (%s)"; +"whats_new_auto_update_button_size" = "تحديث (%s)"; -"whats_new_auto_update_button_later" = "Manually update later"; +"whats_new_auto_update_button_later" = "تحديث يدوياً في وقت لاحق"; "search_hotel_filter_apartment" = "شُقَق"; @@ -1883,8 +1874,29 @@ "search_hotel_filter_resort" = "منتج"; -"search_hotel_filter_motel" = "Motel"; +"search_hotel_filter_hotel" = "الفندق"; -"on" = "On"; +"search_hotel_filter_motel" = "موتيل"; -"off" = "Off"; +"create_campaign_button" = "مطالبة هذه الشركة"; + +"view_campaign_button" = "تم عمل إعلان عن الشركة"; + +"search_hotel_filters_type" = "النوع"; + +/* Settings: "Send general feedback" button */ +"feedback_general" = "تعقيب عام"; + +"on" = "تشغيل"; + +"off" = "إيقاف"; + +"prefs_languages_information" = "نحن نستخدم نظام النص إلى كلام (TTS) للتعليمات الصوتية. تستخدم العديد من أجهزة Android نظام Google TTS، يمكنك تنزيله من أو تحديثه من Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)"; + +"prefs_languages_information_off" = "بالنسبة للغة العربية واليونانية والرومانية قد تحتاج إلى تثبيت نظام نص إلى كلام (TTS) إضافي (حيث إن نظام Google TTS لا يدعم اللغات بعد (من Google Play مثل Vocalizer TTS أو SVOX Classics.\nلإدارة الإعدادات لتخليق الكلام، في الجهاز الخاص بك افتح الإعدادات –> اللغة والإدخال –> الكلام –> إخراج نص إلى كلام. هنا يمكنك تنزيل حزمة لغة إضافية أو تحديد محرك النص إلى كلام المفضل."; + +"prefs_languages_information_off_link" = "لمزيد من المعلومات الرجاء مراجعة هذا الدليل."; + +"whatsnew_transliteration_title" = "كتابة بالحروف اللاتينية"; + +"whatsnew_transliteration_message" = "إذا كان الشارع أو الهدف ليس له اسم بلغتك. فسيتم هجاؤه بالحروف اللاتينية."; diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings index d9b324eea0..db3cad4635 100644 --- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings @@ -473,14 +473,6 @@ /* Settings information group in settings screen */ "prefs_group_information" = "Information"; -/* Settings languages information in voice instructions screen */ -"prefs_languages_information" = "Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.)."; - -/* Settings languages off information in voice instructions screen */ -"prefs_languages_information_off" = "For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine."; - -"prefs_languages_information_off_link" = "For more information please check the guide."; - /* Settings screen: "Map" category title */ "prefs_group_map" = "Mapa"; @@ -634,9 +626,6 @@ /* Settings: Send feedback button and dialog title */ "feedback" = "Zpětná vazba"; -/* Settings: "Send general feedback" button */ -"feedback_general" = "General Feedback"; - /* Text in menu */ "subscribe_to_news" = "Přihlásit se k odběru novinek"; @@ -1666,7 +1655,8 @@ "booking_filters_reset" = "Reset"; -"booking_filters_rating" = "Hodnocení"; +/* Beginning from a particular value and */ +"booking_filters_rating" = "Hodnocení od"; "booking_filters_rating_any" = "Jakékoli"; @@ -1714,7 +1704,8 @@ "dialog_taxi_error" = "Objednání taxi není dočasně k dispozici."; -"advertisement" = "Inzerce"; +/* Abbreviated for all languages. */ +"advertisement" = "AD"; "mobile_data_dialog" = "Použít mobilní internet ke zobrazení podrobnějších informací?"; @@ -1861,15 +1852,15 @@ "booking_search" = "Booking.com"; -"whats_new_auto_update_updating_maps" = "Updating maps"; +"whats_new_auto_update_updating_maps" = "Aktualizuji mapy"; -"whats_new_auto_update_title" = "Update your downloaded maps"; +"whats_new_auto_update_title" = "Aktualizujte své stažené mapy"; -"whats_new_auto_update_message" = "Update maps supports information about objects in the current state"; +"whats_new_auto_update_message" = "Aktualizace map zajišťuje aktuální informace o objektech"; -"whats_new_auto_update_button_size" = "Update (%s)"; +"whats_new_auto_update_button_size" = "Aktualizace (%s)"; -"whats_new_auto_update_button_later" = "Manually update later"; +"whats_new_auto_update_button_later" = "Aktualizovat ručně později"; "search_hotel_filter_apartment" = "Byty"; @@ -1883,8 +1874,29 @@ "search_hotel_filter_resort" = "Letovisko"; +"search_hotel_filter_hotel" = "Hotel"; + "search_hotel_filter_motel" = "Motel"; -"on" = "On"; +"create_campaign_button" = "Zaregistruj si tento podnik"; -"off" = "Off"; +"view_campaign_button" = "Podnik je propagován"; + +"search_hotel_filters_type" = "Typ"; + +/* Settings: "Send general feedback" button */ +"feedback_general" = "Všeobecné připomínky"; + +"on" = "Zapnout"; + +"off" = "Vypnout"; + +"prefs_languages_information" = "Pro hlasové pokyny používáme systém TTS. Mnoho zařízení se systémem Android používá Google TTS, můžete si ho stáhnout nebo aktualizovat na Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)"; + +"prefs_languages_information_off" = "Pro arabštinu, řečtinu a rumunštinu budete muset nainstalovat další TTS (protože Google TTS zatím nepodporuje tyto jazyky) ze služby Google Play, např. Vocalizer TTS nebo SVOX Classics. \nChcete-li spravovat nastavení pro syntézu řeči, na svém zařízení otevřete Nastavení –> Jazyk a vstupy –> Mluvené slovo –> Převod textu na mluvené slovo. Zde si můžete stáhnout další balík jazyků nebo vybrat preferovaný nástroj pro převod textu na mluvené slovo."; + +"prefs_languages_information_off_link" = "Více informací najdete v tomto návodu."; + +"whatsnew_transliteration_title" = "Transliterace do latinky"; + +"whatsnew_transliteration_message" = "Pokud ulice nebo objekt nemá název ve vašem jazyce, bude zobrazeno latinkou."; diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings index a5df4882e7..9d10ea3f63 100644 --- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings @@ -473,14 +473,6 @@ /* Settings information group in settings screen */ "prefs_group_information" = "Information"; -/* Settings languages information in voice instructions screen */ -"prefs_languages_information" = "Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.)."; - -/* Settings languages off information in voice instructions screen */ -"prefs_languages_information_off" = "For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine."; - -"prefs_languages_information_off_link" = "For more information please check the guide."; - /* Settings screen: "Map" category title */ "prefs_group_map" = "Kort"; @@ -634,9 +626,6 @@ /* Settings: Send feedback button and dialog title */ "feedback" = "Feedback"; -/* Settings: "Send general feedback" button */ -"feedback_general" = "General Feedback"; - /* Text in menu */ "subscribe_to_news" = "Abonnér på vores nyheder"; @@ -1666,7 +1655,8 @@ "booking_filters_reset" = "Nulstil"; -"booking_filters_rating" = "Vurdering"; +/* Beginning from a particular value and */ +"booking_filters_rating" = "Vurdering fra"; "booking_filters_rating_any" = "Hvilken som helst"; @@ -1714,7 +1704,8 @@ "dialog_taxi_error" = "Bestilling af en taxi er ikke muligt lige nu."; -"advertisement" = "Annonce"; +/* Abbreviated for all languages. */ +"advertisement" = "AD"; "mobile_data_dialog" = "Skal mobilt internet bruges til at vise detaljerede oplysninger?"; @@ -1861,15 +1852,15 @@ "booking_search" = "Booking.com"; -"whats_new_auto_update_updating_maps" = "Updating maps"; +"whats_new_auto_update_updating_maps" = "Opdaterer kort"; -"whats_new_auto_update_title" = "Update your downloaded maps"; +"whats_new_auto_update_title" = "Opdater dine downloadede kort"; -"whats_new_auto_update_message" = "Update maps supports information about objects in the current state"; +"whats_new_auto_update_message" = "Opdatering af kort sikrer, at oplysningerne om objekter er aktuel"; -"whats_new_auto_update_button_size" = "Update (%s)"; +"whats_new_auto_update_button_size" = "Opdater (%s)"; -"whats_new_auto_update_button_later" = "Manually update later"; +"whats_new_auto_update_button_later" = "Opdater manuelt senere"; "search_hotel_filter_apartment" = "Lejligheder"; @@ -1883,8 +1874,29 @@ "search_hotel_filter_resort" = "Resort"; +"search_hotel_filter_hotel" = "Hotel"; + "search_hotel_filter_motel" = "Motel"; -"on" = "On"; +"create_campaign_button" = "Denne virksomhed tilhører mig"; -"off" = "Off"; +"view_campaign_button" = "Virksomhed er annonceret"; + +"search_hotel_filters_type" = "Type"; + +/* Settings: "Send general feedback" button */ +"feedback_general" = "Generel feedback"; + +"on" = "Til"; + +"off" = "Fra"; + +"prefs_languages_information" = "Vi bruger systemets TTS til stemmevejledning. Mange Android-enheder bruger Google TTS, du kan hente eller opdatere det via Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)"; + +"prefs_languages_information_off" = "I forbindelse med sprogene arabisk, græsk og rumænsk skal du installere yderligere TTS såsom som Vocalizer TTS eller SVOX Classics fra Google Play (eftersom Google TTS ikke understøtter disse sprog endnu). Hvis du vil administrere indstillinger for talesyntese på enheden, skal du åbne Indstillinger –> Sprog og input –> Tale –> Tekst til tale-output. Her kan du downloade yderligere sprogpakker eller vælge dit foretrukne tekst til tale-program."; + +"prefs_languages_information_off_link" = "Se denne vejledning for flere oplysninger."; + +"whatsnew_transliteration_title" = "Translitteration til latinsk"; + +"whatsnew_transliteration_message" = "Hvis en gade eller et objekt ikke har et navn på dit sprog, vil det blive stavet ved hjælp af det latinske alfabet."; diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings index 3b0f1772ac..0a3348ea44 100644 --- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings @@ -473,14 +473,6 @@ /* Settings information group in settings screen */ "prefs_group_information" = "Information"; -/* Settings languages information in voice instructions screen */ -"prefs_languages_information" = "Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.)."; - -/* Settings languages off information in voice instructions screen */ -"prefs_languages_information_off" = "For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine."; - -"prefs_languages_information_off_link" = "For more information please check the guide."; - /* Settings screen: "Map" category title */ "prefs_group_map" = "Karte"; @@ -634,9 +626,6 @@ /* Settings: Send feedback button and dialog title */ "feedback" = "Feedback"; -/* Settings: "Send general feedback" button */ -"feedback_general" = "Allgemeine Rückmeldung"; - /* Text in menu */ "subscribe_to_news" = "Abonnieren Sie unsere News"; @@ -1666,7 +1655,8 @@ "booking_filters_reset" = "Zurücksetzen"; -"booking_filters_rating" = "Bewertung"; +/* Beginning from a particular value and */ +"booking_filters_rating" = "Bewertung von"; "booking_filters_rating_any" = "Alle"; @@ -1714,7 +1704,8 @@ "dialog_taxi_error" = "Das Bestellen eines Taxis ist vorübergehend nicht verfügbar."; -"advertisement" = "Werbung"; +/* Abbreviated for all languages. */ +"advertisement" = "AD"; "mobile_data_dialog" = "Mobiles Internet verwenden, um genauere Informationen anzuzeigen?"; @@ -1861,15 +1852,15 @@ "booking_search" = "Booking.com"; -"whats_new_auto_update_updating_maps" = "Updating maps"; +"whats_new_auto_update_updating_maps" = "Kartenaktualisierung"; -"whats_new_auto_update_title" = "Update your downloaded maps"; +"whats_new_auto_update_title" = "Aktualisieren Sie Ihre heruntergeladenen Karten"; -"whats_new_auto_update_message" = "Update maps supports information about objects in the current state"; +"whats_new_auto_update_message" = "Das Aktualisieren der Karten sorgt dafür, dass die Objektinformationen stets auf dem neuesten Stand sind"; -"whats_new_auto_update_button_size" = "Update (%s)"; +"whats_new_auto_update_button_size" = "Aktualisieren (%s)"; -"whats_new_auto_update_button_later" = "Manually update later"; +"whats_new_auto_update_button_later" = "Später manuell aktualisieren"; "search_hotel_filter_apartment" = "Appartements"; @@ -1883,8 +1874,29 @@ "search_hotel_filter_resort" = "Resort"; +"search_hotel_filter_hotel" = "Hotel"; + "search_hotel_filter_motel" = "Motel"; -"on" = "On"; +"create_campaign_button" = "Ist das Ihr Unternehmen?"; -"off" = "Off"; +"view_campaign_button" = "Es wird für das Unternehmen geworben"; + +"search_hotel_filters_type" = "Art"; + +/* Settings: "Send general feedback" button */ +"feedback_general" = "Allgemeines Feedback"; + +"on" = "An"; + +"off" = "Aus"; + +"prefs_languages_information" = "Wir verwenden Text-to-Speech-Systeme für Sprachanweisungen. Viele Android-Geräte nutzen Google-TTS, das können Sie bei Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) herunterladen oder aktualisieren."; + +"prefs_languages_information_off" = "Für Arabisch, Griechisch und Rumänisch müssen Sie möglicherweise zusätzliche TTS-Systeme von Google Play herunterladen und installieren (denn Google-TTS unterstützt diese Sprachen bisher noch nicht), Sie können zum Beispiel Vocalizer TTS oder SVOX Classics verwenden. Um die Einstellungen für Sprachsynthese zu verwalten, gehen Sie auf Ihrem Gerät zu Einstellungen -> Sprache und Eingabe -> Sprache -> Text-to-Speech-Ausgabe. Hier können Sie zusätzliche Sprachpakete herunterladen oder das bevorzugte Versprachlichungsprogramm auswählen."; + +"prefs_languages_information_off_link" = "Weitere Informationen finden Sie in dieser Anleitung."; + +"whatsnew_transliteration_title" = "Transliteration ins Lateinische"; + +"whatsnew_transliteration_message" = "Wenn eine Straße oder ein Objekt in Ihrer Sprache keinen Namen hat, wird er mit lateinischen Buchstaben geschrieben."; diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings index c8e10be72e..5944859ecf 100644 --- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings @@ -473,14 +473,6 @@ /* Settings information group in settings screen */ "prefs_group_information" = "Information"; -/* Settings languages information in voice instructions screen */ -"prefs_languages_information" = "Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.)."; - -/* Settings languages off information in voice instructions screen */ -"prefs_languages_information_off" = "For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine."; - -"prefs_languages_information_off_link" = "For more information please check the guide."; - /* Settings screen: "Map" category title */ "prefs_group_map" = "Χάρτης"; @@ -634,9 +626,6 @@ /* Settings: Send feedback button and dialog title */ "feedback" = "Σχόλια"; -/* Settings: "Send general feedback" button */ -"feedback_general" = "Γενικάό σχόλιο"; - /* Text in menu */ "subscribe_to_news" = "Εγγραφή στο ενημερωτικό μας δελτίο"; @@ -1666,7 +1655,8 @@ "booking_filters_reset" = "Μηδενισμός"; -"booking_filters_rating" = "Βαθμολογία"; +/* Beginning from a particular value and */ +"booking_filters_rating" = "Βαθμολογία από"; "booking_filters_rating_any" = "Οποιοδήποτε"; @@ -1714,7 +1704,8 @@ "dialog_taxi_error" = "Η παραγγελία ταξί είναι προσωρινά μη διαθέσιμη."; -"advertisement" = "Διαφήμιση"; +/* Abbreviated for all languages. */ +"advertisement" = "AD"; "mobile_data_dialog" = "Θέλετε να χρησιμοποιήσετε το δίκτυο κινητής τηλεφωνίας για να εμφανίσετε αναλυτικές πληροφορίες;"; @@ -1861,15 +1852,15 @@ "booking_search" = "Booking.com"; -"whats_new_auto_update_updating_maps" = "Updating maps"; +"whats_new_auto_update_updating_maps" = "Ενημέρωση χαρτών"; -"whats_new_auto_update_title" = "Update your downloaded maps"; +"whats_new_auto_update_title" = "Θα πρέπει να ενημερώστε τους χάρτες που έχετε κατεβάσει"; -"whats_new_auto_update_message" = "Update maps supports information about objects in the current state"; +"whats_new_auto_update_message" = "Η ενημέρωση των χαρτών διατηρεί τις πληροφορίες των στοιχείων επικαιροποιημένες"; -"whats_new_auto_update_button_size" = "Update (%s)"; +"whats_new_auto_update_button_size" = "Ενημέρωση (%s)"; -"whats_new_auto_update_button_later" = "Manually update later"; +"whats_new_auto_update_button_later" = "Χειροκίνητη ενημέρωση αργότερα"; "search_hotel_filter_apartment" = "Διαμερίσματα"; @@ -1883,8 +1874,29 @@ "search_hotel_filter_resort" = "Θέρετρο"; -"search_hotel_filter_motel" = "Motel"; +"search_hotel_filter_hotel" = "Ξενοδοχείο"; -"on" = "On"; +"search_hotel_filter_motel" = "Μοτέλ"; -"off" = "Off"; +"create_campaign_button" = "Καταχωρήστε αυτήν την επιχείρηση"; + +"view_campaign_button" = "Η επιχείριση διαφημίζεται"; + +"search_hotel_filters_type" = "Τύπος"; + +/* Settings: "Send general feedback" button */ +"feedback_general" = "Γενικό σχόλιο"; + +"on" = "Ενεργ."; + +"off" = "Απενεργ."; + +"prefs_languages_information" = "Χρησιμοποιούμε σύστημα TTS για τις φωνητικές οδηγίες. Αρκετές συσκευές Android χρησιμοποιούν Google TTS, μπορείτε να το κατεβάσετε ή να το ενημερώσετε από το Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)"; + +"prefs_languages_information_off" = "Για Αραβικά, Ελληνικά και Ρουμανικά ίσως χρειάζεται να εγκαταστήσετε συμπληρωματικό TTS (δεδομένου ότι το Google TTS δεν υποστηρίζει τις συγκεκριμένες γλώσσες προς το παρόν) από το Google Play όπως το Vocalizer TTS ή το SVOX Classics. \nΓια να αλλάξετε τις ρυθμίσεις της σύνθεσης ομιλίας, στη συσκευή σας ανοίξτε το μενού Ρυθμίσεις – > Γλώσσα και εισαγωγή – > Ομιλία – > Μετατροπή κειμένου σε ομιλία. Εδώ μπορείτε να κατεβάσετε συμπληρωματικά πακέτα γλώσσας ή να επιλέξετε τη μηχανή μετατροπής κειμένου σε ομιλία που προτιμάτε."; + +"prefs_languages_information_off_link" = "Για περισσότερες πληροφορίες δείτε αυτό τον οδηγό."; + +"whatsnew_transliteration_title" = "Μεταγραφή στα Λατινικά"; + +"whatsnew_transliteration_message" = "Εάν ένας δρόμος ή ένα αντικείμενο δεν έχει όνομα στη γλώσσα σας, θα διατυπωθεί χρησιμοποιώντας το λατινικό αλφάβητο."; diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings index a7697d3fdb..a2ea012ff0 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings @@ -473,14 +473,6 @@ /* Settings information group in settings screen */ "prefs_group_information" = "Information"; -/* Settings languages information in voice instructions screen */ -"prefs_languages_information" = "Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.)."; - -/* Settings languages off information in voice instructions screen */ -"prefs_languages_information_off" = "For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine."; - -"prefs_languages_information_off_link" = "For more information please check the guide."; - /* Settings screen: "Map" category title */ "prefs_group_map" = "Map"; @@ -634,9 +626,6 @@ /* Settings: Send feedback button and dialog title */ "feedback" = "Feedback"; -/* Settings: "Send general feedback" button */ -"feedback_general" = "General Feedback"; - /* Text in menu */ "subscribe_to_news" = "Subscribe to our newsletter"; @@ -1666,7 +1655,8 @@ "booking_filters_reset" = "Reset"; -"booking_filters_rating" = "Rating"; +/* Beginning from a particular value and */ +"booking_filters_rating" = "Rating from"; "booking_filters_rating_any" = "Any"; @@ -1714,7 +1704,8 @@ "dialog_taxi_error" = "Taxi booking is temporarily unavailable."; -"advertisement" = "Advertisement"; +/* Abbreviated for all languages. */ +"advertisement" = "AD"; "mobile_data_dialog" = "Use mobile internet to show detailed information?"; @@ -1865,7 +1856,7 @@ "whats_new_auto_update_title" = "Update your downloaded maps"; -"whats_new_auto_update_message" = "Update maps supports information about objects in the current state"; +"whats_new_auto_update_message" = "Updating maps keeps the information about objects up to date"; "whats_new_auto_update_button_size" = "Update (%s)"; @@ -1883,8 +1874,29 @@ "search_hotel_filter_resort" = "Resort"; +"search_hotel_filter_hotel" = "Hotel"; + "search_hotel_filter_motel" = "Motel"; +"create_campaign_button" = "Claim this business"; + +"view_campaign_button" = "Business is advertised"; + +"search_hotel_filters_type" = "Type"; + +/* Settings: "Send general feedback" button */ +"feedback_general" = "General Feedback"; + "on" = "On"; "off" = "Off"; + +"prefs_languages_information" = "We use system TTS for voice instructions. Many Android devices use Google TTS, you can download or update it from Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)"; + +"prefs_languages_information_off" = "For Arabic, Greek and Romanian languages you may need to install additional TTS (as Google TTS doesn’t support the languages yet) from Google Play like Vocalizer TTS or SVOX Classics.\nTo manage settings for speech synthesis, on your device open Settings –> Language and input –> Speech –> Text to speech output. Here you can download additional language pack or select preferred text-to-speech engine."; + +"prefs_languages_information_off_link" = "For more information please check this guide."; + +"whatsnew_transliteration_title" = "Transliteration into Latin"; + +"whatsnew_transliteration_message" = "If a street or an object doesn't have a name in your language, it will be spelt using the Latin alphabet."; diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings index 29b9bdd50c..409b05ea83 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings @@ -473,14 +473,6 @@ /* Settings information group in settings screen */ "prefs_group_information" = "Information"; -/* Settings languages information in voice instructions screen */ -"prefs_languages_information" = "Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.)."; - -/* Settings languages off information in voice instructions screen */ -"prefs_languages_information_off" = "For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine."; - -"prefs_languages_information_off_link" = "For more information please check the guide."; - /* Settings screen: "Map" category title */ "prefs_group_map" = "Map"; @@ -634,9 +626,6 @@ /* Settings: Send feedback button and dialog title */ "feedback" = "Feedback"; -/* Settings: "Send general feedback" button */ -"feedback_general" = "General Feedback"; - /* Text in menu */ "subscribe_to_news" = "Subscribe to our newsletter"; @@ -1666,7 +1655,8 @@ "booking_filters_reset" = "Reset"; -"booking_filters_rating" = "Rating"; +/* Beginning from a particular value and */ +"booking_filters_rating" = "Rating from"; "booking_filters_rating_any" = "Any"; @@ -1714,7 +1704,8 @@ "dialog_taxi_error" = "Taxi ordering is temporarily unavailable."; -"advertisement" = "Advertisement"; +/* Abbreviated for all languages. */ +"advertisement" = "AD"; "mobile_data_dialog" = "Use mobile internet to show detailed information?"; @@ -1865,7 +1856,7 @@ "whats_new_auto_update_title" = "Update your downloaded maps"; -"whats_new_auto_update_message" = "Update maps supports information about objects in the current state"; +"whats_new_auto_update_message" = "Updating maps keeps the information about objects up to date"; "whats_new_auto_update_button_size" = "Update (%s)"; @@ -1883,8 +1874,29 @@ "search_hotel_filter_resort" = "Resort"; +"search_hotel_filter_hotel" = "Hotel"; + "search_hotel_filter_motel" = "Motel"; +"create_campaign_button" = "Claim this business"; + +"view_campaign_button" = "Business is advertised"; + +"search_hotel_filters_type" = "Type"; + +/* Settings: "Send general feedback" button */ +"feedback_general" = "General Feedback"; + "on" = "On"; "off" = "Off"; + +"prefs_languages_information" = "We use system TTS for voice instructions. Many Android devices use Google TTS, you can download or update it from Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)"; + +"prefs_languages_information_off" = "For Arabic, Greek and Romanian languages you may need to install additional TTS (as Google TTS doesn’t support the languages yet) from Google Play like Vocalizer TTS or SVOX Classics.\nTo manage settings for speech synthesis, on your device open Settings –> Language and input –> Speech –> Text to speech output. Here you can download additional language pack or select preferred text-to-speech engine."; + +"prefs_languages_information_off_link" = "For more information please check this guide."; + +"whatsnew_transliteration_title" = "Transliteration into Latin"; + +"whatsnew_transliteration_message" = "If a street or an object doesn't have a name in your language, it will be spelt using the Latin alphabet."; diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings index c0bc9f1fcd..3abe9fd47a 100644 --- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings @@ -473,14 +473,6 @@ /* Settings information group in settings screen */ "prefs_group_information" = "Information"; -/* Settings languages information in voice instructions screen */ -"prefs_languages_information" = "Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.)."; - -/* Settings languages off information in voice instructions screen */ -"prefs_languages_information_off" = "For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine."; - -"prefs_languages_information_off_link" = "For more information please check the guide."; - /* Settings screen: "Map" category title */ "prefs_group_map" = "Mapa"; @@ -634,9 +626,6 @@ /* Settings: Send feedback button and dialog title */ "feedback" = "Comentarios"; -/* Settings: "Send general feedback" button */ -"feedback_general" = "General Feedback"; - /* Text in menu */ "subscribe_to_news" = "Suscríbete a nuestras noticias"; @@ -1666,7 +1655,8 @@ "booking_filters_reset" = "Restablecer"; -"booking_filters_rating" = "Clasificación"; +/* Beginning from a particular value and */ +"booking_filters_rating" = "Con calificación desde"; "booking_filters_rating_any" = "Cualquier"; @@ -1714,7 +1704,8 @@ "dialog_taxi_error" = "La opción para solicitar un taxi se encuentra temporalmente no disponible."; -"advertisement" = "Anuncio"; +/* Abbreviated for all languages. */ +"advertisement" = "AD"; "mobile_data_dialog" = "¿Usar Internet móvil para mostrar información detallada?"; @@ -1861,15 +1852,15 @@ "booking_search" = "Booking.com"; -"whats_new_auto_update_updating_maps" = "Updating maps"; +"whats_new_auto_update_updating_maps" = "Actualizando mapas"; -"whats_new_auto_update_title" = "Update your downloaded maps"; +"whats_new_auto_update_title" = "Actualice sus mapas descargados"; -"whats_new_auto_update_message" = "Update maps supports information about objects in the current state"; +"whats_new_auto_update_message" = "La actualización de mapas mantiene actualizada la información sobre objetos"; -"whats_new_auto_update_button_size" = "Update (%s)"; +"whats_new_auto_update_button_size" = "Actualizar (%s)"; -"whats_new_auto_update_button_later" = "Manually update later"; +"whats_new_auto_update_button_later" = "Actualizar más tarde de forma manual"; "search_hotel_filter_apartment" = "Apartamentos"; @@ -1883,8 +1874,29 @@ "search_hotel_filter_resort" = "Resort"; +"search_hotel_filter_hotel" = "Hotel"; + "search_hotel_filter_motel" = "Motel"; -"on" = "On"; +"create_campaign_button" = "Este negocio es mío"; -"off" = "Off"; +"view_campaign_button" = "Anuncio destacado"; + +"search_hotel_filters_type" = "Tipo"; + +/* Settings: "Send general feedback" button */ +"feedback_general" = "Opinión general"; + +"on" = "Akt."; + +"off" = "Desact."; + +"prefs_languages_information" = "Utilizamos el sistema TTS para las instrucciones de voz. Muchos dispositivos de Android usan Google TTS. Puede descargar o actualizarlo desde Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)"; + +"prefs_languages_information_off" = "Para los idiomas árabe, griego y rumano, es posible que necesite instalar un TTS adicional (puesto que Google TTS aún no incluye estos idiomas) desde Google Play, como Vocalizer TTS o SVOX Classics.\nPara administrar los ajustes de síntesis del habla, abra los Ajustes de su dispositivo –> Idioma e introducción –> Voz –> Opciones texto a voz. En este menú puede descargar un paquete de idioma especial o seleccionar un motor existente de conversión de texto a voz."; + +"prefs_languages_information_off_link" = "Para obtener más información, consulte esta guía."; + +"whatsnew_transliteration_title" = "Transliteración al alfabeto latino"; + +"whatsnew_transliteration_message" = "Si una calle o un objeto no tiene nombre en su idioma, se escribirá con el alfabeto latino."; diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings index 531fbdcb0c..17251e876f 100644 --- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings @@ -473,14 +473,6 @@ /* Settings information group in settings screen */ "prefs_group_information" = "Information"; -/* Settings languages information in voice instructions screen */ -"prefs_languages_information" = "Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.)."; - -/* Settings languages off information in voice instructions screen */ -"prefs_languages_information_off" = "For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine."; - -"prefs_languages_information_off_link" = "For more information please check the guide."; - /* Settings screen: "Map" category title */ "prefs_group_map" = "Kartta"; @@ -634,9 +626,6 @@ /* Settings: Send feedback button and dialog title */ "feedback" = "Palaute"; -/* Settings: "Send general feedback" button */ -"feedback_general" = "General Feedback"; - /* Text in menu */ "subscribe_to_news" = "Tilaa uutiskirjeemme"; @@ -1666,7 +1655,8 @@ "booking_filters_reset" = "Palauta"; -"booking_filters_rating" = "Arvio"; +/* Beginning from a particular value and */ +"booking_filters_rating" = "Arvio vähintään"; "booking_filters_rating_any" = "Kaikki"; @@ -1714,7 +1704,8 @@ "dialog_taxi_error" = "Taksin tilaaminen ei ole tällä hetkellä mahdollista."; -"advertisement" = "Mainos"; +/* Abbreviated for all languages. */ +"advertisement" = "AD"; "mobile_data_dialog" = "Näytetäänkö lisätiedot mobiili-internetillä?"; @@ -1861,15 +1852,15 @@ "booking_search" = "Booking.com"; -"whats_new_auto_update_updating_maps" = "Updating maps"; +"whats_new_auto_update_updating_maps" = "Päivitetään karttoja"; -"whats_new_auto_update_title" = "Update your downloaded maps"; +"whats_new_auto_update_title" = "Päivitä ladatut kartat"; -"whats_new_auto_update_message" = "Update maps supports information about objects in the current state"; +"whats_new_auto_update_message" = "Karttojen päivittäminen pitää kohteita koskevat tiedot ajan tasalla"; -"whats_new_auto_update_button_size" = "Update (%s)"; +"whats_new_auto_update_button_size" = "Päivitä (%s)"; -"whats_new_auto_update_button_later" = "Manually update later"; +"whats_new_auto_update_button_later" = "Päivitä manuaalisesti myöhemmin"; "search_hotel_filter_apartment" = "Loma-asunnot"; @@ -1883,8 +1874,29 @@ "search_hotel_filter_resort" = "Lomakohteet"; -"search_hotel_filter_motel" = "Motel"; +"search_hotel_filter_hotel" = "Hotelli"; -"on" = "On"; +"search_hotel_filter_motel" = "Motelli"; -"off" = "Off"; +"create_campaign_button" = "Ilmoittaudu yrityksen omistajaksi"; + +"view_campaign_button" = "Yritystä mainostetaan"; + +"search_hotel_filters_type" = "Tyyppi"; + +/* Settings: "Send general feedback" button */ +"feedback_general" = "Yleinen palaute"; + +"on" = "Käytössä"; + +"off" = "Ei käytössä"; + +"prefs_languages_information" = "Käytämme ääniohjeisiin tekstistä puheeksi -järjestelmää. Monet Android-laitteet käyttävät Googlen tekstistä puheeksi -sovellusta, jonka voit ladata tai päivittää Google Playssä (https://play.google.com/store/apps/details?id=com.google.android.tts)"; + +"prefs_languages_information_off" = "Arabian, kreikan ja romanian kieliä varten sinun täytyy mahdollisesti asentaa ylimääräinen tekstistä puheeksi -järjestelmä Google Playstä (koska Googlen tekstistä puheeksi -sovellus ei vielä tue näitä kieliä), kuten Vocalizer TTS tai SVOX Classic. Voit hallita tekstistä puheeksi -ominaisuuden asetuksia laitteellasi kohdassa Asetukset –> Kieli ja syöttötapa –> Puhe –> Tekstistä puheeksi -toisto. Täällä voit ladata uusia kielipaketteja tai valita haluamasi tekstistä puheeksi -ohjelman."; + +"prefs_languages_information_off_link" = "Lisätietoja saat tästä oppaasta."; + +"whatsnew_transliteration_title" = "Translitterointi latinaksi"; + +"whatsnew_transliteration_message" = "Jos kadulla tai kohteella ei ole nimeä kielelläsi, se kirjoitetetaan latinalaisilla kirjaimilla."; diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings index 4c298b9f08..a50dc14260 100644 --- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings @@ -473,14 +473,6 @@ /* Settings information group in settings screen */ "prefs_group_information" = "Information"; -/* Settings languages information in voice instructions screen */ -"prefs_languages_information" = "Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.)."; - -/* Settings languages off information in voice instructions screen */ -"prefs_languages_information_off" = "For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine."; - -"prefs_languages_information_off_link" = "For more information please check the guide."; - /* Settings screen: "Map" category title */ "prefs_group_map" = "Carte"; @@ -634,9 +626,6 @@ /* Settings: Send feedback button and dialog title */ "feedback" = "Feedback"; -/* Settings: "Send general feedback" button */ -"feedback_general" = "Avis général"; - /* Text in menu */ "subscribe_to_news" = "S'abonner à nos informations"; @@ -1666,7 +1655,8 @@ "booking_filters_reset" = "Réinitialiser"; -"booking_filters_rating" = "Note"; +/* Beginning from a particular value and */ +"booking_filters_rating" = "Note à partir de"; "booking_filters_rating_any" = "N’importe quel"; @@ -1714,7 +1704,8 @@ "dialog_taxi_error" = "La commande d'un taxi est temporairement indisponible."; -"advertisement" = "Publicité"; +/* Abbreviated for all languages. */ +"advertisement" = "AD"; "mobile_data_dialog" = "Utiliser l'Internet mobile pour afficher les informations détaillées?"; @@ -1861,15 +1852,15 @@ "booking_search" = "Booking.com"; -"whats_new_auto_update_updating_maps" = "Updating maps"; +"whats_new_auto_update_updating_maps" = "Mise à jour des cartes"; -"whats_new_auto_update_title" = "Update your downloaded maps"; +"whats_new_auto_update_title" = "Mettez à jour vos cartes téléchargées"; -"whats_new_auto_update_message" = "Update maps supports information about objects in the current state"; +"whats_new_auto_update_message" = "Actualiser les cartes permet d'actualiser également les informations sur les objets"; -"whats_new_auto_update_button_size" = "Update (%s)"; +"whats_new_auto_update_button_size" = "Mettre à jour (%s)"; -"whats_new_auto_update_button_later" = "Manually update later"; +"whats_new_auto_update_button_later" = "Mettre à jour manuellement plus tard"; "search_hotel_filter_apartment" = "Appart'hôtel"; @@ -1883,8 +1874,29 @@ "search_hotel_filter_resort" = "Complexe touristique"; +"search_hotel_filter_hotel" = "Hôtel"; + "search_hotel_filter_motel" = "Motel"; +"create_campaign_button" = "Cette entreprise m'appartient"; + +"view_campaign_button" = "L'entreprise est publiée"; + +"search_hotel_filters_type" = "Type"; + +/* Settings: "Send general feedback" button */ +"feedback_general" = "Feedback général"; + "on" = "On"; "off" = "Off"; + +"prefs_languages_information" = "Nous utilisons le système TTS pour les instructions vocales. De nombreux appareils Android utilisent Google TTS, vous pouvez le télécharger ou le mettre à jour depuis Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)"; + +"prefs_languages_information_off" = "Pour les langues arabe, grecque et roumaine, Il vous faudra peut-être installer un TTS supplémentaire (car Google TTS n'est pas encore compatible avec ces langues) depuis Google Play tel que Vocalizer TTS ou SVOX Classics. Pour gérer les paramètres de synthèse vocale, ouvrez sur votre appareil Paramètres –> Langue et entrée – > Parole – > Texte en parole. Vous pouvez télécharger ici un package de langues supplémentaires ou sélectionner votre logiciel de synthèse vocale préféré."; + +"prefs_languages_information_off_link" = "Pour plus d’informations, veuillez consulter ce guide."; + +"whatsnew_transliteration_title" = "Translittération en latin"; + +"whatsnew_transliteration_message" = "Si une rue ou un objet n’a pas de nom dans votre langue, l’alphabet latin sera utilisé pour l'écrire."; diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings index 159cd58625..12fd9ed0bb 100644 --- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings @@ -473,14 +473,6 @@ /* Settings information group in settings screen */ "prefs_group_information" = "Information"; -/* Settings languages information in voice instructions screen */ -"prefs_languages_information" = "Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.)."; - -/* Settings languages off information in voice instructions screen */ -"prefs_languages_information_off" = "For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine."; - -"prefs_languages_information_off_link" = "For more information please check the guide."; - /* Settings screen: "Map" category title */ "prefs_group_map" = "Térkép"; @@ -634,9 +626,6 @@ /* Settings: Send feedback button and dialog title */ "feedback" = "Visszajelzés"; -/* Settings: "Send general feedback" button */ -"feedback_general" = "General Feedback"; - /* Text in menu */ "subscribe_to_news" = "Iratkozz fel hírlevelünkre"; @@ -1666,7 +1655,8 @@ "booking_filters_reset" = "Alaphelyzetbe állítás"; -"booking_filters_rating" = "Minősítés"; +/* Beginning from a particular value and */ +"booking_filters_rating" = "Besorolás innentől"; "booking_filters_rating_any" = "Bármelyik"; @@ -1714,7 +1704,8 @@ "dialog_taxi_error" = "A taxirendelés átmenetileg nem elérhető."; -"advertisement" = "Hirdetés"; +/* Abbreviated for all languages. */ +"advertisement" = "AD"; "mobile_data_dialog" = "Részletes információk megjelenítése a mobil internet segítségével?"; @@ -1861,15 +1852,15 @@ "booking_search" = "Booking.com"; -"whats_new_auto_update_updating_maps" = "Updating maps"; +"whats_new_auto_update_updating_maps" = "Térképek frissítése"; -"whats_new_auto_update_title" = "Update your downloaded maps"; +"whats_new_auto_update_title" = "Frissítse a letöltött térképeit"; -"whats_new_auto_update_message" = "Update maps supports information about objects in the current state"; +"whats_new_auto_update_message" = "A térképek frissítésével naprakészen tarthatja az objektumokra vonatkozó adatokat"; -"whats_new_auto_update_button_size" = "Update (%s)"; +"whats_new_auto_update_button_size" = "Frissítés (%s)"; -"whats_new_auto_update_button_later" = "Manually update later"; +"whats_new_auto_update_button_later" = "Kézi frissítés később"; "search_hotel_filter_apartment" = "Apartmanok"; @@ -1883,8 +1874,29 @@ "search_hotel_filter_resort" = "Resort hotel"; +"search_hotel_filter_hotel" = "Szálloda"; + "search_hotel_filter_motel" = "Motel"; -"on" = "On"; +"create_campaign_button" = "Igényelje ezt az üzletet"; -"off" = "Off"; +"view_campaign_button" = "Hirdetett üzlet"; + +"search_hotel_filters_type" = "Típus"; + +/* Settings: "Send general feedback" button */ +"feedback_general" = "Általános visszajelzés"; + +"on" = "Be"; + +"off" = "Ki"; + +"prefs_languages_information" = "TTS rendszert használunk a hangnavigációhoz. Sok Android-os készülék használja a Google TTS-t; töltse le vagy frissítse a Google Play áruházból (https://play.google.com/store/apps/details?id=com.google.android.tts)"; + +"prefs_languages_information_off" = "Arab, görög és román nyelven szükség lehet arra, hogy további TTS-t telepítsen Google Play áruházból (mivel a Google TTS még nem támogatja a nyelveket), mint például a Vocalizer TTS-t vagy a SVOX Classics alkalmazást. \nBeszédszintézis beállításainak kezeléséhez nyissa meg készülékén a következőket: Beállítások–> Nyelv és adatbevitel-–>Beszéd –> Szöveg-beszéd átalakítás kimenet. Itt további nyelvi csomagokat tölthet le, kiválaszthatja a kívánt szöveg-beszéd motort."; + +"prefs_languages_information_off_link" = "További tájékoztatást találhat még ebben az útmutatóban."; + +"whatsnew_transliteration_title" = "Átírás latin nyelvre"; + +"whatsnew_transliteration_message" = "Ha egy utcának vagy egy objektumnak nincs neve az Ön nyelvén, latin ábécével kerül átírásra."; diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings index a6cf572cfd..721586b67c 100644 --- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings @@ -473,14 +473,6 @@ /* Settings information group in settings screen */ "prefs_group_information" = "Information"; -/* Settings languages information in voice instructions screen */ -"prefs_languages_information" = "Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.)."; - -/* Settings languages off information in voice instructions screen */ -"prefs_languages_information_off" = "For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine."; - -"prefs_languages_information_off_link" = "For more information please check the guide."; - /* Settings screen: "Map" category title */ "prefs_group_map" = "Peta"; @@ -634,9 +626,6 @@ /* Settings: Send feedback button and dialog title */ "feedback" = "Umpan balik"; -/* Settings: "Send general feedback" button */ -"feedback_general" = "General Feedback"; - /* Text in menu */ "subscribe_to_news" = "Berlangganan berita kami"; @@ -1666,7 +1655,8 @@ "booking_filters_reset" = "Atur ulang"; -"booking_filters_rating" = "Peringkat"; +/* Beginning from a particular value and */ +"booking_filters_rating" = "Peringkat dari"; "booking_filters_rating_any" = "Apa saja"; @@ -1714,7 +1704,8 @@ "dialog_taxi_error" = "Memesan taksi untuk sementara tidak tersedia."; -"advertisement" = "Iklan"; +/* Abbreviated for all languages. */ +"advertisement" = "AD"; "mobile_data_dialog" = "Gunakan internet seluler untuk memperlihatkan informasi terperinci?"; @@ -1861,15 +1852,15 @@ "booking_search" = "Booking.com"; -"whats_new_auto_update_updating_maps" = "Updating maps"; +"whats_new_auto_update_updating_maps" = "Memperbarui peta"; -"whats_new_auto_update_title" = "Update your downloaded maps"; +"whats_new_auto_update_title" = "Perbarui peta yang sudah Anda unduh"; -"whats_new_auto_update_message" = "Update maps supports information about objects in the current state"; +"whats_new_auto_update_message" = "Memperbarui peta membuat informasi tentang objek tetap terkini"; -"whats_new_auto_update_button_size" = "Update (%s)"; +"whats_new_auto_update_button_size" = "Pembaruan (%s)"; -"whats_new_auto_update_button_later" = "Manually update later"; +"whats_new_auto_update_button_later" = "Perbarui secara manual nanti"; "search_hotel_filter_apartment" = "Apartemen"; @@ -1883,8 +1874,29 @@ "search_hotel_filter_resort" = "Sanggraloka"; +"search_hotel_filter_hotel" = "Hotel"; + "search_hotel_filter_motel" = "Motel"; +"create_campaign_button" = "Klaim bisnis ini"; + +"view_campaign_button" = "Bisnis diiklankan"; + +"search_hotel_filters_type" = "Jenis"; + +/* Settings: "Send general feedback" button */ +"feedback_general" = "Umpan Balik Umum"; + "on" = "On"; -"off" = "Off"; +"off" = "Mati"; + +"prefs_languages_information" = "Kami menggunakan TTS sistem untuk petunjuk suara. Banyak perangkat Android menggunakan Google TTS, Anda dapat mengunduhnya dari Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)"; + +"prefs_languages_information_off" = "Untuk bahasa Arab, Yunani, dan Romania, Anda mungkin perlu menginstal TTS tambahan (karena Google TTS belum mendukung bahasa-bahasa ini) dari Google Play, seperti Vocalizer TTS atau SVOX Classics.\nUntuk mengelola pengaturan untuk sintesis suara, pada perangkat Anda buka Settings (Pengaturan) –> Language and input (Bahasa dan input) –> Speech (Tuturan) –> Text to speech output (Output teks ke tuturan). Di sini Anda dapat mengunduh paket bahasa tambahan atau memilih mesin teks ke tuturan yang diinginkan."; + +"prefs_languages_information_off_link" = "Untuk informasi selengkapnya, bacalah panduan ini."; + +"whatsnew_transliteration_title" = "Transliterasi ke dalam bahasa Latin"; + +"whatsnew_transliteration_message" = "Jika jalan atau objek tidak memiliki nama dalam bahasa Anda, namanya akan dieja menggunakan alfabet Latin."; diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings index 3aee7c3edf..9c873ee70e 100644 --- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings @@ -473,14 +473,6 @@ /* Settings information group in settings screen */ "prefs_group_information" = "Information"; -/* Settings languages information in voice instructions screen */ -"prefs_languages_information" = "Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.)."; - -/* Settings languages off information in voice instructions screen */ -"prefs_languages_information_off" = "For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine."; - -"prefs_languages_information_off_link" = "For more information please check the guide."; - /* Settings screen: "Map" category title */ "prefs_group_map" = "Mappa"; @@ -634,9 +626,6 @@ /* Settings: Send feedback button and dialog title */ "feedback" = "Feedback"; -/* Settings: "Send general feedback" button */ -"feedback_general" = "General Feedback"; - /* Text in menu */ "subscribe_to_news" = "Iscriviti alle nostre notizie"; @@ -1666,7 +1655,8 @@ "booking_filters_reset" = "Reimposta"; -"booking_filters_rating" = "Voto"; +/* Beginning from a particular value and */ +"booking_filters_rating" = "Voto da"; "booking_filters_rating_any" = "Qualsiasi"; @@ -1714,7 +1704,8 @@ "dialog_taxi_error" = "La chiamata taxi è temporaneamente non disponibile."; -"advertisement" = "Annuncio"; +/* Abbreviated for all languages. */ +"advertisement" = "AD"; "mobile_data_dialog" = "Usare l'Internet mobile per mostrare le informazioni dettagliate?"; @@ -1861,15 +1852,15 @@ "booking_search" = "Booking.com"; -"whats_new_auto_update_updating_maps" = "Updating maps"; +"whats_new_auto_update_updating_maps" = "Aggiornamento mappe"; -"whats_new_auto_update_title" = "Update your downloaded maps"; +"whats_new_auto_update_title" = "Aggiorna le mappe scaricate"; -"whats_new_auto_update_message" = "Update maps supports information about objects in the current state"; +"whats_new_auto_update_message" = "Aggiornamento mappe mantiene aggiornate le informazioni sugli oggetti"; -"whats_new_auto_update_button_size" = "Update (%s)"; +"whats_new_auto_update_button_size" = "Aggiorna (%s)"; -"whats_new_auto_update_button_later" = "Manually update later"; +"whats_new_auto_update_button_later" = "Aggiorna manualmente più tardi"; "search_hotel_filter_apartment" = "Residence"; @@ -1883,8 +1874,29 @@ "search_hotel_filter_resort" = "Resort"; +"search_hotel_filter_hotel" = "Hôtel"; + "search_hotel_filter_motel" = "Motel"; +"create_campaign_button" = "Rivendica questa attività"; + +"view_campaign_button" = "Attività pubblicizzata"; + +"search_hotel_filters_type" = "Tipo"; + +/* Settings: "Send general feedback" button */ +"feedback_general" = "Feedback generale"; + "on" = "On"; "off" = "Off"; + +"prefs_languages_information" = "Usiamo il TTS di sistema per le istruzioni vocali. Molti dispositivi Android utilizzano Google TTS, che puoi scaricare o aggiornare da Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)"; + +"prefs_languages_information_off" = "Per l'arabo, il greco e il rumeno, potrebbe essere necessario installare un servizio TTS aggiuntivo (poiché Google TTS non supporta ancora queste lingue) da Google Play, ad esempio Vocalizer TTS o SVOX Classics.\nPer gestire le impostazioni di sintesi vocale, dal tuo dispositivo apri Impostazioni –> Lingua e input –> Riconoscimento vocale –> Output sintesi vocale. Qui puoi scaricare il language pack aggiuntivo o selezionare il tuo motore di sintesi vocale preferito."; + +"prefs_languages_information_off_link" = "Per maggiori informazioni, consulta questa guida."; + +"whatsnew_transliteration_title" = "Traslitterazione in latino"; + +"whatsnew_transliteration_message" = "Se una strada o un oggetto non ha un nome nella tua lingua, tale nome sarà scritto utilizzando l'alfabeto latino."; diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings index 9ad0738472..3636e24011 100644 --- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings @@ -473,14 +473,6 @@ /* Settings information group in settings screen */ "prefs_group_information" = "Information"; -/* Settings languages information in voice instructions screen */ -"prefs_languages_information" = "Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.)."; - -/* Settings languages off information in voice instructions screen */ -"prefs_languages_information_off" = "For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine."; - -"prefs_languages_information_off_link" = "For more information please check the guide."; - /* Settings screen: "Map" category title */ "prefs_group_map" = "地図"; @@ -634,9 +626,6 @@ /* Settings: Send feedback button and dialog title */ "feedback" = "フィードバック"; -/* Settings: "Send general feedback" button */ -"feedback_general" = "General Feedback"; - /* Text in menu */ "subscribe_to_news" = "当社のニュースに登録"; @@ -1666,7 +1655,8 @@ "booking_filters_reset" = "リセット"; -"booking_filters_rating" = "評価"; +/* Beginning from a particular value and */ +"booking_filters_rating" = "指定評価以上"; "booking_filters_rating_any" = "すべて"; @@ -1714,7 +1704,8 @@ "dialog_taxi_error" = "タクシーの予約が一時的に使用できません。"; -"advertisement" = "広告"; +/* Abbreviated for all languages. */ +"advertisement" = "AD"; "mobile_data_dialog" = "モバイルインターネットを使用して詳細な情報を表示しますか？"; @@ -1861,15 +1852,15 @@ "booking_search" = "Booking.com"; -"whats_new_auto_update_updating_maps" = "Updating maps"; +"whats_new_auto_update_updating_maps" = "地図を更新中"; -"whats_new_auto_update_title" = "Update your downloaded maps"; +"whats_new_auto_update_title" = "ダウンロード済みのマップを更新してください"; -"whats_new_auto_update_message" = "Update maps supports information about objects in the current state"; +"whats_new_auto_update_message" = "地図を更新することで物件情報を最新の状態に保ちます"; -"whats_new_auto_update_button_size" = "Update (%s)"; +"whats_new_auto_update_button_size" = "更新 (%s)"; -"whats_new_auto_update_button_later" = "Manually update later"; +"whats_new_auto_update_button_later" = "あとで手動で更新"; "search_hotel_filter_apartment" = "アパート"; @@ -1883,8 +1874,29 @@ "search_hotel_filter_resort" = "リゾート"; -"search_hotel_filter_motel" = "Motel"; +"search_hotel_filter_hotel" = "ホテル"; -"on" = "On"; +"search_hotel_filter_motel" = "モーテル"; -"off" = "Off"; +"create_campaign_button" = "この企業の所有者であることを報告"; + +"view_campaign_button" = "企業は宣伝中です"; + +"search_hotel_filters_type" = "種類"; + +/* Settings: "Send general feedback" button */ +"feedback_general" = "一般的なフィードバック"; + +"on" = "オン"; + +"off" = "オフ"; + +"prefs_languages_information" = "音声案内にはシステムの TTS を使用します。多くの Android 端末が Google の TTS を使用しており、Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) からダウンロードや更新を行うことができます。"; + +"prefs_languages_information_off" = "アラビア語、ギリシャ語、ルーマニア語では Vocalizer TTS や SVOX Classics のような追加の TTS を Google Play からインストールする必要があるかもしれません（Google TTS がまだこれらの言語をサポートしていないため）。\n音声合成の設定を管理するには、お使いのデバイスで [設定] –> [言語と入力] –> [音声] –> [テキスト読み上げの出力] を開きます。こここで追加の言語パックをダウンロードしたり、お好みの音声合成エンジンを選択することができます。"; + +"prefs_languages_information_off_link" = "詳細については、このガイドをご確認ください。"; + +"whatsnew_transliteration_title" = "ラテン文字への字訳"; + +"whatsnew_transliteration_message" = "通り名や物件名をあなたの言語で表示できない場合、ラテン文字のアルファベットで綴られます。"; diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings index a5a9ff2e28..0ed8e4ff77 100644 --- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings @@ -473,14 +473,6 @@ /* Settings information group in settings screen */ "prefs_group_information" = "Information"; -/* Settings languages information in voice instructions screen */ -"prefs_languages_information" = "Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.)."; - -/* Settings languages off information in voice instructions screen */ -"prefs_languages_information_off" = "For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine."; - -"prefs_languages_information_off_link" = "For more information please check the guide."; - /* Settings screen: "Map" category title */ "prefs_group_map" = "지도"; @@ -634,9 +626,6 @@ /* Settings: Send feedback button and dialog title */ "feedback" = "피드백"; -/* Settings: "Send general feedback" button */ -"feedback_general" = "General Feedback"; - /* Text in menu */ "subscribe_to_news" = "우리 뉴스 구독"; @@ -1666,7 +1655,8 @@ "booking_filters_reset" = "재설정"; -"booking_filters_rating" = "평가"; +/* Beginning from a particular value and */ +"booking_filters_rating" = "등급"; "booking_filters_rating_any" = "모두"; @@ -1714,7 +1704,8 @@ "dialog_taxi_error" = "일시적으로 택시를 예약할 수 없습니다."; -"advertisement" = "광고"; +/* Abbreviated for all languages. */ +"advertisement" = "AD"; "mobile_data_dialog" = "모바일 인터넷을 사용하여 자세한 정보를 표시하시겠습니까?"; @@ -1861,15 +1852,15 @@ "booking_search" = "Booking.com"; -"whats_new_auto_update_updating_maps" = "Updating maps"; +"whats_new_auto_update_updating_maps" = "지도 업데이트"; -"whats_new_auto_update_title" = "Update your downloaded maps"; +"whats_new_auto_update_title" = "다운로드한 지도를 업데이트해야 합니다"; -"whats_new_auto_update_message" = "Update maps supports information about objects in the current state"; +"whats_new_auto_update_message" = "지도를 업데이트하면 개체에 대한 정보가 최신 상태로 유지됩니다."; -"whats_new_auto_update_button_size" = "Update (%s)"; +"whats_new_auto_update_button_size" = "업데이트(%s)"; -"whats_new_auto_update_button_later" = "Manually update later"; +"whats_new_auto_update_button_later" = "나중에 수동으로 업데이트"; "search_hotel_filter_apartment" = "아파트"; @@ -1883,8 +1874,29 @@ "search_hotel_filter_resort" = "리조트"; -"search_hotel_filter_motel" = "Motel"; +"search_hotel_filter_hotel" = "호텔"; -"on" = "On"; +"search_hotel_filter_motel" = "모텔"; -"off" = "Off"; +"create_campaign_button" = "이 비즈니스 클레임"; + +"view_campaign_button" = "비즈니스 광고를 하고 있습니다."; + +"search_hotel_filters_type" = "유형"; + +/* Settings: "Send general feedback" button */ +"feedback_general" = "일반 피드백"; + +"on" = "켜기"; + +"off" = "끄기"; + +"prefs_languages_information" = "당사는 음성 지침을 위해 시스템 TTS를 사용합니다. 많은 Android 장치에서 Google TTS를 사용합니다. Google Play(https://play.google.com/store/apps/details?id=com.google.android.tts)에서 Google TTS를 다운로드하거나 업데이트할 수 있습니다."; + +"prefs_languages_information_off" = "아랍어, 그리스어 및 루마니아어의 경우 Google Play에서 Vocalizer TTS 또는 SVOX Classic 같은 추가적인 TTS(Google TTS는 해당 언어를 아직 지원하지 않음)를 설치해야 할 수 있습니다.\n음성 합성에 대한 설정을 관리하려면 장치에서 설정 -> 언어 및 입력 -> 음성 -> 음성으로 읽어주기 설정을 엽니다. 여기에서 추가적인 언어 팩을 다운로드하거나 기본 음성으로 읽어주기 엔진을 선택할 수 있습니다."; + +"prefs_languages_information_off_link" = "자세한 내용을 보려면 이 가이드를 확인하세요."; + +"whatsnew_transliteration_title" = "라틴어로 음역"; + +"whatsnew_transliteration_message" = "거리 또는 개체에 사용자 언어로 된 이름이 없는 경우, 라틴 알파벳을 사용하여 나옵니다."; diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings index 9af20c5592..6c4aa7c5a2 100644 --- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings @@ -473,14 +473,6 @@ /* Settings information group in settings screen */ "prefs_group_information" = "Information"; -/* Settings languages information in voice instructions screen */ -"prefs_languages_information" = "Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.)."; - -/* Settings languages off information in voice instructions screen */ -"prefs_languages_information_off" = "For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine."; - -"prefs_languages_information_off_link" = "For more information please check the guide."; - /* Settings screen: "Map" category title */ "prefs_group_map" = "Kart"; @@ -634,9 +626,6 @@ /* Settings: Send feedback button and dialog title */ "feedback" = "Tilbakemelding"; -/* Settings: "Send general feedback" button */ -"feedback_general" = "General Feedback"; - /* Text in menu */ "subscribe_to_news" = "Abonner på nyheter fra oss"; @@ -1666,7 +1655,8 @@ "booking_filters_reset" = "Tilbakestille"; -"booking_filters_rating" = "Vurdering"; +/* Beginning from a particular value and */ +"booking_filters_rating" = "Rangering fra"; "booking_filters_rating_any" = "Hvilken som helst"; @@ -1714,7 +1704,8 @@ "dialog_taxi_error" = "Bestilling av taxi er ikke tilgjengelig for øyeblikket."; -"advertisement" = "Reklame"; +/* Abbreviated for all languages. */ +"advertisement" = "AD"; "mobile_data_dialog" = "Bruke mobilt Internett til å vise detaljert informasjon?"; @@ -1861,15 +1852,15 @@ "booking_search" = "Booking.com"; -"whats_new_auto_update_updating_maps" = "Updating maps"; +"whats_new_auto_update_updating_maps" = "Oppdaterer kart"; -"whats_new_auto_update_title" = "Update your downloaded maps"; +"whats_new_auto_update_title" = "Oppdater dine nedlastede kart"; -"whats_new_auto_update_message" = "Update maps supports information about objects in the current state"; +"whats_new_auto_update_message" = "Ved å oppdatere kart holder du også informasjonen om ulike elementer oppdatert"; -"whats_new_auto_update_button_size" = "Update (%s)"; +"whats_new_auto_update_button_size" = "Oppdater (%s)"; -"whats_new_auto_update_button_later" = "Manually update later"; +"whats_new_auto_update_button_later" = "Oppdater manuelt senere"; "search_hotel_filter_apartment" = "Leiligheter"; @@ -1883,8 +1874,29 @@ "search_hotel_filter_resort" = "Ferieresort"; -"search_hotel_filter_motel" = "Motel"; +"search_hotel_filter_hotel" = "Hotell"; -"on" = "On"; +"search_hotel_filter_motel" = "Motell"; -"off" = "Off"; +"create_campaign_button" = "Dette er min bedrift"; + +"view_campaign_button" = "Virksomheten er annonsert"; + +"search_hotel_filters_type" = "Type"; + +/* Settings: "Send general feedback" button */ +"feedback_general" = "Generell tilbakemelding"; + +"on" = "På"; + +"off" = "Av"; + +"prefs_languages_information" = "Vi bruker system TTS for stemmeveiledning. Mange Android-enheter bruker Google TTS, Du kan laste ned eller oppdatere via Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)"; + +"prefs_languages_information_off" = "Du må installere ekstra TTS for arabisk, gresk og rumensk (siden Google TTS ikke støtter språkene ennå) fra Google Play, som for eksempel Vocalizer TTS eller SVOX Classics.\nFor å behandle innstillinger for talesyntese, gå til Innstillinger -> Språk og inndata -> Tale-> Tekst til tale. Her kan du laste ned flere språkpakker eller velg foretrukket tekst til tale-motor."; + +"prefs_languages_information_off_link" = "Les denne veiledningen for mer informasjon."; + +"whatsnew_transliteration_title" = "Omskrivning til latin"; + +"whatsnew_transliteration_message" = "Hvis en gate eller et element ikke har et navn på ditt språk, vil det bli skrevet med det latinske alfabetet."; diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings index a8ccb65556..f12f0a8eb1 100644 --- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings @@ -473,14 +473,6 @@ /* Settings information group in settings screen */ "prefs_group_information" = "Information"; -/* Settings languages information in voice instructions screen */ -"prefs_languages_information" = "Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.)."; - -/* Settings languages off information in voice instructions screen */ -"prefs_languages_information_off" = "For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine."; - -"prefs_languages_information_off_link" = "For more information please check the guide."; - /* Settings screen: "Map" category title */ "prefs_group_map" = "Kaart"; @@ -634,9 +626,6 @@ /* Settings: Send feedback button and dialog title */ "feedback" = "Feedback"; -/* Settings: "Send general feedback" button */ -"feedback_general" = "General Feedback"; - /* Text in menu */ "subscribe_to_news" = "Aanmelden voor onze nieuwtjes"; @@ -1666,7 +1655,8 @@ "booking_filters_reset" = "Resetten"; -"booking_filters_rating" = "Beoordeling"; +/* Beginning from a particular value and */ +"booking_filters_rating" = "Rating van"; "booking_filters_rating_any" = "Alle"; @@ -1714,7 +1704,8 @@ "dialog_taxi_error" = "Het bestellen van een taxi is tijdelijk niet beschikbaar."; -"advertisement" = "Reclame"; +/* Abbreviated for all languages. */ +"advertisement" = "AD"; "mobile_data_dialog" = "Mobiel internet gebruiken om gedetailleerde informatie weer te geven?"; @@ -1861,15 +1852,15 @@ "booking_search" = "Booking.com"; -"whats_new_auto_update_updating_maps" = "Updating maps"; +"whats_new_auto_update_updating_maps" = "Kaarten bijwerken"; -"whats_new_auto_update_title" = "Update your downloaded maps"; +"whats_new_auto_update_title" = "Werk uw gedownloade kaarten bij"; -"whats_new_auto_update_message" = "Update maps supports information about objects in the current state"; +"whats_new_auto_update_message" = "Kaarten bijwerken houdt de informatie over objecten actueel"; -"whats_new_auto_update_button_size" = "Update (%s)"; +"whats_new_auto_update_button_size" = "Bijwerken (%s)"; -"whats_new_auto_update_button_later" = "Manually update later"; +"whats_new_auto_update_button_later" = "Later handmatig bijwerken"; "search_hotel_filter_apartment" = "Appartementen"; @@ -1883,8 +1874,29 @@ "search_hotel_filter_resort" = "Complex"; +"search_hotel_filter_hotel" = "Hotel"; + "search_hotel_filter_motel" = "Motel"; -"on" = "On"; +"create_campaign_button" = "Dit bedrijf claimen"; -"off" = "Off"; +"view_campaign_button" = "Bedrijf wordt geadverteerd"; + +"search_hotel_filters_type" = "Type"; + +/* Settings: "Send general feedback" button */ +"feedback_general" = "Algemene Feedback"; + +"on" = "Aan"; + +"off" = "Uit"; + +"prefs_languages_information" = "We gebruiken het TTS-systeem voor gesproken instructies. Vele Android toestellen gebruiken Google TTS, u kunt het downloaden of bijwerken in Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)"; + +"prefs_languages_information_off" = "Voor Arabische, Griekse en Roemeense talen dient u mogelijk aanvullende TTS te installeren (aangezien Google TTS de talen nog niet ondersteunt) in Google Play, zoals Vocalizer TTS of SVOX Classics.\nOm instellingen voor spraaksynthese te beheren, open op uw toestel Instellingen -> Taal en invoer -> Spraak -> Uitvoer voor tekst-naar-spraak. Hier kunt u aanvullende taalpakketten downloaden of de tekst-naar-spraak engine van uw voorkeur selecteren."; + +"prefs_languages_information_off_link" = "Gelieve deze handleiding te lezen voor meer informatie."; + +"whatsnew_transliteration_title" = "Transliteratie in het Latijn"; + +"whatsnew_transliteration_message" = "Indien een straat of object geen naam heeft in uw taal, wordt deze gespeld door gebruik van het Latijns alfabet."; diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings index 51b73087b0..694006b8dc 100644 --- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings @@ -473,14 +473,6 @@ /* Settings information group in settings screen */ "prefs_group_information" = "Information"; -/* Settings languages information in voice instructions screen */ -"prefs_languages_information" = "Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.)."; - -/* Settings languages off information in voice instructions screen */ -"prefs_languages_information_off" = "For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine."; - -"prefs_languages_information_off_link" = "For more information please check the guide."; - /* Settings screen: "Map" category title */ "prefs_group_map" = "Mapa"; @@ -634,9 +626,6 @@ /* Settings: Send feedback button and dialog title */ "feedback" = "Opinia"; -/* Settings: "Send general feedback" button */ -"feedback_general" = "Ogólne opinie"; - /* Text in menu */ "subscribe_to_news" = "Subskrybuj nasze wiadomości"; @@ -1666,7 +1655,8 @@ "booking_filters_reset" = "Resetuj"; -"booking_filters_rating" = "Ocena"; +/* Beginning from a particular value and */ +"booking_filters_rating" = "Ocena od"; "booking_filters_rating_any" = "Wszelkie"; @@ -1714,7 +1704,8 @@ "dialog_taxi_error" = "Zamawianie taksówek jest tymczasowo niedostępne."; -"advertisement" = "Reklama"; +/* Abbreviated for all languages. */ +"advertisement" = "AD"; "mobile_data_dialog" = "Wykorzystać internet mobilny, aby wyświetlić dane szczegółowe?"; @@ -1861,15 +1852,15 @@ "booking_search" = "Booking.com"; -"whats_new_auto_update_updating_maps" = "Updating maps"; +"whats_new_auto_update_updating_maps" = "Aktualizacja map"; -"whats_new_auto_update_title" = "Update your downloaded maps"; +"whats_new_auto_update_title" = "Zaktualizuj pobrane mapy"; -"whats_new_auto_update_message" = "Update maps supports information about objects in the current state"; +"whats_new_auto_update_message" = "Aktualizacja map umożliwia uzyskanie bieżących informacji o obiektach"; -"whats_new_auto_update_button_size" = "Update (%s)"; +"whats_new_auto_update_button_size" = "Zaktualizuj (%s)"; -"whats_new_auto_update_button_later" = "Manually update later"; +"whats_new_auto_update_button_later" = "Zaktualizuj ręcznie później"; "search_hotel_filter_apartment" = "Apartamenty"; @@ -1883,8 +1874,29 @@ "search_hotel_filter_resort" = "Dom wczasowy"; +"search_hotel_filter_hotel" = "Hotel"; + "search_hotel_filter_motel" = "Motel"; -"on" = "On"; +"create_campaign_button" = "Zweryfikuj jako moja firma"; -"off" = "Off"; +"view_campaign_button" = "Firma jest reklamowana"; + +"search_hotel_filters_type" = "Typ"; + +/* Settings: "Send general feedback" button */ +"feedback_general" = "Ogólne uwagi"; + +"on" = "Wł."; + +"off" = "Wył."; + +"prefs_languages_information" = "Stosujemy system TTS dla komend głosowych. Stosuje go wiele urządzeń z systemem Android, można go pobrać lub zaktualizować z Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)"; + +"prefs_languages_information_off" = "Do obsługi języka arabskiego, greckiego i rumuńskiego koniecznie może być zainstalowanie dodatkowych systemów TTS (Google TTS nie obsługuje obecnie tych języków) z Google Play, takich jak Vocalizer TTS lub SVOX Classics. Aby zarządzać ustawieniami dla syntezy mowy, na swoim urządzeniu otwórz Ustawienia –> Język i wprowadzanie – > Mowa – > Wyjście tekstu na mowę. Tutaj można pobrać dodatkowe pakiety językowe lub wybrać preferowane silniki konwersji tekstu na mowę."; + +"prefs_languages_information_off_link" = "Aby uzyskać więcej informacji, sprawdź ten poradnik."; + +"whatsnew_transliteration_title" = "Transkrypcja na alfabet łaciński"; + +"whatsnew_transliteration_message" = "Jeśli dana ulica lub obiekt nie posiada nazwy w twoim języku, ich nazwa zapisana zostanie w alfabecie łacińskim."; diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings index 326235e93b..a7f072022a 100644 --- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings @@ -473,14 +473,6 @@ /* Settings information group in settings screen */ "prefs_group_information" = "Information"; -/* Settings languages information in voice instructions screen */ -"prefs_languages_information" = "Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.)."; - -/* Settings languages off information in voice instructions screen */ -"prefs_languages_information_off" = "For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine."; - -"prefs_languages_information_off_link" = "For more information please check the guide."; - /* Settings screen: "Map" category title */ "prefs_group_map" = "Mapa"; @@ -634,9 +626,6 @@ /* Settings: Send feedback button and dialog title */ "feedback" = "Comentários"; -/* Settings: "Send general feedback" button */ -"feedback_general" = "General Feedback"; - /* Text in menu */ "subscribe_to_news" = "Subscreva as nossas notícias"; @@ -1666,7 +1655,8 @@ "booking_filters_reset" = "Redefinir"; -"booking_filters_rating" = "Classificação"; +/* Beginning from a particular value and */ +"booking_filters_rating" = "Com classificação desde"; "booking_filters_rating_any" = "Qualquer"; @@ -1714,7 +1704,8 @@ "dialog_taxi_error" = "O serviço de táxi está temporariamente indisponível."; -"advertisement" = "Anúncio"; +/* Abbreviated for all languages. */ +"advertisement" = "AD"; "mobile_data_dialog" = "Utilizar a internet móvel para mostrar informações detalhadas?"; @@ -1861,19 +1852,19 @@ "booking_search" = "Booking.com"; -"whats_new_auto_update_updating_maps" = "Updating maps"; +"whats_new_auto_update_updating_maps" = "Atualização de mapas"; -"whats_new_auto_update_title" = "Update your downloaded maps"; +"whats_new_auto_update_title" = "Atualize seus mapas transferidos"; -"whats_new_auto_update_message" = "Update maps supports information about objects in the current state"; +"whats_new_auto_update_message" = "Atualizar os mapas mantém atualizada a informação sobre objetos"; -"whats_new_auto_update_button_size" = "Update (%s)"; +"whats_new_auto_update_button_size" = "Atualização (%s)"; -"whats_new_auto_update_button_later" = "Manually update later"; +"whats_new_auto_update_button_later" = "Atualizar manualmente mais tarde"; "search_hotel_filter_apartment" = "Apartamentos"; -"search_hotel_filter_camp_site" = "Camping"; +"search_hotel_filter_camp_site" = "Acampamento"; "search_hotel_filter_chalet" = "Chalé"; @@ -1883,8 +1874,29 @@ "search_hotel_filter_resort" = "Resort"; +"search_hotel_filter_hotel" = "Hotel"; + "search_hotel_filter_motel" = "Motel"; -"on" = "On"; +"create_campaign_button" = "Reivindicar este negócio"; -"off" = "Off"; +"view_campaign_button" = "Negócio publicitado"; + +"search_hotel_filters_type" = "Tipo"; + +/* Settings: "Send general feedback" button */ +"feedback_general" = "Opinão geral"; + +"on" = "Lig."; + +"off" = "Deslig."; + +"prefs_languages_information" = "Utilizamos o sistema TTS para instruções de voz. Muitos dispositivos Android usam o Google TTS, pode transferir ou atualizá-lo a partir do Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)"; + +"prefs_languages_information_off" = "Para os idiomas árabe, grego e romeno: é possível que tenha de instalar TTS adicionais (uma vez que o Google TTS ainda não inclui estes idiomas) a partir do Google Play, como o Vocalizer TTS ou o SVOX Classics. Para gerir as configurações de síntese de fala, no seu dispositivo, vá a Configurações – > idioma e entrada – > voz – > saída de texto para voz. Aqui pode transferir um pacote de idioma adicional ou selecionar um motor de texto para voz."; + +"prefs_languages_information_off_link" = "Para obter mais informações, consulte este guia."; + +"whatsnew_transliteration_title" = "Transliteração para o latim"; + +"whatsnew_transliteration_message" = "Se uma rua ou um objeto não tiver nome na sua língua, será utilizado o alfabeto latino."; diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings index 3defb9a6db..26e5b49b2a 100644 --- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings @@ -473,14 +473,6 @@ /* Settings information group in settings screen */ "prefs_group_information" = "Information"; -/* Settings languages information in voice instructions screen */ -"prefs_languages_information" = "Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.)."; - -/* Settings languages off information in voice instructions screen */ -"prefs_languages_information_off" = "For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine."; - -"prefs_languages_information_off_link" = "For more information please check the guide."; - /* Settings screen: "Map" category title */ "prefs_group_map" = "Hartă"; @@ -634,9 +626,6 @@ /* Settings: Send feedback button and dialog title */ "feedback" = "Feedback"; -/* Settings: "Send general feedback" button */ -"feedback_general" = "General Feedback"; - /* Text in menu */ "subscribe_to_news" = "Abonați-vă la știrile noastre"; @@ -1666,7 +1655,8 @@ "booking_filters_reset" = "Resetare"; -"booking_filters_rating" = "Clasificare"; +/* Beginning from a particular value and */ +"booking_filters_rating" = "Evaluări de la"; "booking_filters_rating_any" = "Oricare"; @@ -1714,7 +1704,8 @@ "dialog_taxi_error" = "Comandarea unui taxi este momentan indisponibilă."; -"advertisement" = "Reclamă"; +/* Abbreviated for all languages. */ +"advertisement" = "AD"; "mobile_data_dialog" = "Folosiți internetul mobil pentru a afişa informaţii detaliate?"; @@ -1861,15 +1852,15 @@ "booking_search" = "Booking.com"; -"whats_new_auto_update_updating_maps" = "Updating maps"; +"whats_new_auto_update_updating_maps" = "Se actualizează hărțile"; -"whats_new_auto_update_title" = "Update your downloaded maps"; +"whats_new_auto_update_title" = "Actualizați hărțile descărcate"; -"whats_new_auto_update_message" = "Update maps supports information about objects in the current state"; +"whats_new_auto_update_message" = "Actualizarea hărților vă ajută să păstrați actualizate informațiile despre obiecte"; -"whats_new_auto_update_button_size" = "Update (%s)"; +"whats_new_auto_update_button_size" = "Actualizare (%s)"; -"whats_new_auto_update_button_later" = "Manually update later"; +"whats_new_auto_update_button_later" = "Actualizare manuală mai târziu"; "search_hotel_filter_apartment" = "Apartamente"; @@ -1883,8 +1874,29 @@ "search_hotel_filter_resort" = "Stațiuni"; +"search_hotel_filter_hotel" = "Hotel"; + "search_hotel_filter_motel" = "Motel"; -"on" = "On"; +"create_campaign_button" = "Revendicați această afacere"; -"off" = "Off"; +"view_campaign_button" = "Afacerea este promovată"; + +"search_hotel_filters_type" = "Tip"; + +/* Settings: "Send general feedback" button */ +"feedback_general" = "Feedback general"; + +"on" = "Activat"; + +"off" = "Dezactivat"; + +"prefs_languages_information" = "Pentru instrucțiuni vocale utilizăm sistemul TTS. Multe dispozitive cu Android folosesc Google TTS. Puteți descărca sau actualiza aplicația din Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)"; + +"prefs_languages_information_off" = "Pentru limbile arabă, greacă și română ar putea fi necesar să instalați alte aplicații TTS (deoarece Google TTS nu oferă încă suport pentru aceste limbi) din Google Play, ca de exemplu Vocalizer TTS sau SVOX Classics.\nPentru setarea sintetizatorului vocal, deschideți pe dispozitiv Setări –> Limbă și introducere –> Voce –> Text. De aici puteți descărca pachete de limbi suplimentare sau selecta motorul preferat de transcriere vocală."; + +"prefs_languages_information_off_link" = "Consultați acest ghid pentru informații suplimentare."; + +"whatsnew_transliteration_title" = "Transcriere în alfabet latin"; + +"whatsnew_transliteration_message" = "Dacă o stradă sau un obiect nu are un nume în limba dvs., va fi exprimat utilizând alfabetul latin."; diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings index 29468141db..edd8beaa2d 100644 --- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings @@ -473,14 +473,6 @@ /* Settings information group in settings screen */ "prefs_group_information" = "Информация"; -/* Settings languages information in voice instructions screen */ -"prefs_languages_information" = "Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.)."; - -/* Settings languages off information in voice instructions screen */ -"prefs_languages_information_off" = "For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine."; - -"prefs_languages_information_off_link" = "Для получения дополнительной информации, пожалуйста, ознакомьтесь с руководством."; - /* Settings screen: "Map" category title */ "prefs_group_map" = "Карта"; @@ -634,9 +626,6 @@ /* Settings: Send feedback button and dialog title */ "feedback" = "Связаться с нами"; -/* Settings: "Send general feedback" button */ -"feedback_general" = "Отправить отзыв"; - /* Text in menu */ "subscribe_to_news" = "Подписаться на новости"; @@ -1666,7 +1655,8 @@ "booking_filters_reset" = "Сбросить"; -"booking_filters_rating" = "Рейтинг"; +/* Beginning from a particular value and */ +"booking_filters_rating" = "Рейтинг от"; "booking_filters_rating_any" = "Любой"; @@ -1714,7 +1704,8 @@ "dialog_taxi_error" = "Заказ такси временно недоступен."; -"advertisement" = "Реклама"; +/* Abbreviated for all languages. */ +"advertisement" = "AD"; "mobile_data_dialog" = "Загружать дополнительную информацию через мобильный интернет?"; @@ -1883,8 +1874,29 @@ "search_hotel_filter_resort" = "Дом отдыха"; +"search_hotel_filter_hotel" = "Гостиница"; + "search_hotel_filter_motel" = "Мотель"; +"create_campaign_button" = "Я владелец компании"; + +"view_campaign_button" = "Эта компания рекламируется"; + +"search_hotel_filters_type" = "Тип"; + +/* Settings: "Send general feedback" button */ +"feedback_general" = "Отправить отзыв"; + "on" = "Вкл."; "off" = "Выкл."; + +"prefs_languages_information" = "Подсказки озвучиваются системным ситнтезатором речи (TTS). На многих устройствах используется Google TTS, его можно загрузить или обновить в Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)"; + +"prefs_languages_information_off" = "Для арабского, греческого и румынского языков, возможно, необходимо установить дополнительный синтезатор речи (TTS) из Google Play, например, Vocalizer TTS or SVOX Classics, так как Google TTS пока не поддерживает эти языки. Чтобы настроить синтезатор речи, перейдите в Настройки -> Язык и ввод -> Синтез речи. Здесь можно установить допольнительные языковые пакеты или выбрать синтезатор речи."; + +"prefs_languages_information_off_link" = "Более подробная информация — в этом руководстве."; + +"whatsnew_transliteration_title" = "Латинская транслитерация"; + +"whatsnew_transliteration_message" = "Если у улицы или объекта нет названия на вашем языке, то мы покажем его латиницей."; diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings index e7e88e3d5a..987f8fc9cf 100644 --- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings @@ -473,14 +473,6 @@ /* Settings information group in settings screen */ "prefs_group_information" = "Information"; -/* Settings languages information in voice instructions screen */ -"prefs_languages_information" = "Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.)."; - -/* Settings languages off information in voice instructions screen */ -"prefs_languages_information_off" = "For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine."; - -"prefs_languages_information_off_link" = "For more information please check the guide."; - /* Settings screen: "Map" category title */ "prefs_group_map" = "Mapa"; @@ -634,9 +626,6 @@ /* Settings: Send feedback button and dialog title */ "feedback" = "Spätná väzba"; -/* Settings: "Send general feedback" button */ -"feedback_general" = "General Feedback"; - /* Text in menu */ "subscribe_to_news" = "Prihlásiť sa k našim novinkám"; @@ -1666,7 +1655,8 @@ "booking_filters_reset" = "Obnoviť"; -"booking_filters_rating" = "Hodnotenie"; +/* Beginning from a particular value and */ +"booking_filters_rating" = "Hodnotenie nad"; "booking_filters_rating_any" = "Akékoľvek"; @@ -1714,7 +1704,8 @@ "dialog_taxi_error" = "Objednanie taxíka je dočasne nedostupné."; -"advertisement" = "Reklama"; +/* Abbreviated for all languages. */ +"advertisement" = "AD"; "mobile_data_dialog" = "Použiť mobilný internet na zobrazenie podrobnejších informácií?"; @@ -1861,15 +1852,15 @@ "booking_search" = "Booking.com"; -"whats_new_auto_update_updating_maps" = "Updating maps"; +"whats_new_auto_update_updating_maps" = "Prebieha aktualizácia máp"; -"whats_new_auto_update_title" = "Update your downloaded maps"; +"whats_new_auto_update_title" = "Aktualizujte svoje stiahnuté mapy"; -"whats_new_auto_update_message" = "Update maps supports information about objects in the current state"; +"whats_new_auto_update_message" = "Vďaka aktualizácii máp budú informácie o objektoch na mape aktualizované"; -"whats_new_auto_update_button_size" = "Update (%s)"; +"whats_new_auto_update_button_size" = "Aktualizovať (%s)"; -"whats_new_auto_update_button_later" = "Manually update later"; +"whats_new_auto_update_button_later" = "Manuálne aktualizovať neskôr"; "search_hotel_filter_apartment" = "Apartmány"; @@ -1883,8 +1874,29 @@ "search_hotel_filter_resort" = "Rezort"; +"search_hotel_filter_hotel" = "Hotel"; + "search_hotel_filter_motel" = "Motel"; -"on" = "On"; +"create_campaign_button" = "Nárokovať záznam firmy"; -"off" = "Off"; +"view_campaign_button" = "Firma sa inzeruje"; + +"search_hotel_filters_type" = "Typ"; + +/* Settings: "Send general feedback" button */ +"feedback_general" = "Všeobecné pripomienky"; + +"on" = "Zap."; + +"off" = "Vyp."; + +"prefs_languages_information" = "Na hlasové pokyny používame systém TTS. Mnohé zariadenia s Adroidom používajú Google TTS, ktorý si môžete stiahnuť alebo aktualizovať z obchodu Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)"; + +"prefs_languages_information_off" = "Pre arabčinu, gréčtinu a rumunčinu bude potrebné z obchodu Google Play nainštalovať dodatočné TTS (keďže Google tieto jazyky ešte nepodporuje) ako Vocalizer TTS alebo SVOX Classics. Ak chcete nastaviť nastavenia na syntézu reči, otvorte v zariadení Nastavenia -> Jazyk a vstup -> Reč -> Výstup textu na reč. Tam si môžete prevziať dodatočný jazykový balík alebo si vybrať preferovaný systém prevodu textu na reč."; + +"prefs_languages_information_off_link" = "Viac informácií nájdete v tomto návode."; + +"whatsnew_transliteration_title" = "Prepis do latinčiny"; + +"whatsnew_transliteration_message" = "Ak ulica alebo objekt nemá názov vo vašom jazyku, prepíše sa tento názov latinkou."; diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings index 05950ed02d..55155ea565 100644 --- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings @@ -473,14 +473,6 @@ /* Settings information group in settings screen */ "prefs_group_information" = "Information"; -/* Settings languages information in voice instructions screen */ -"prefs_languages_information" = "Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.)."; - -/* Settings languages off information in voice instructions screen */ -"prefs_languages_information_off" = "For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine."; - -"prefs_languages_information_off_link" = "For more information please check the guide."; - /* Settings screen: "Map" category title */ "prefs_group_map" = "Karta"; @@ -634,9 +626,6 @@ /* Settings: Send feedback button and dialog title */ "feedback" = "Feedback"; -/* Settings: "Send general feedback" button */ -"feedback_general" = "General Feedback"; - /* Text in menu */ "subscribe_to_news" = "Prenumerera på våra nyheter"; @@ -1666,7 +1655,8 @@ "booking_filters_reset" = "Återställ"; -"booking_filters_rating" = "Betyg"; +/* Beginning from a particular value and */ +"booking_filters_rating" = "Betyg från"; "booking_filters_rating_any" = "Vilket som helst"; @@ -1714,7 +1704,8 @@ "dialog_taxi_error" = "Du kan inte beställa en taxi just nu."; -"advertisement" = "Annons"; +/* Abbreviated for all languages. */ +"advertisement" = "AD"; "mobile_data_dialog" = "Använd mobilt nätverk för att visa detaljerad information?"; @@ -1861,15 +1852,15 @@ "booking_search" = "Booking.com"; -"whats_new_auto_update_updating_maps" = "Updating maps"; +"whats_new_auto_update_updating_maps" = "Uppdaterar kartor"; -"whats_new_auto_update_title" = "Update your downloaded maps"; +"whats_new_auto_update_title" = "Uppdatera dina nedladdade kartor"; -"whats_new_auto_update_message" = "Update maps supports information about objects in the current state"; +"whats_new_auto_update_message" = "Uppdatering av kartor håller information om objekt uppdaterade"; -"whats_new_auto_update_button_size" = "Update (%s)"; +"whats_new_auto_update_button_size" = "Uppdatera (%s)"; -"whats_new_auto_update_button_later" = "Manually update later"; +"whats_new_auto_update_button_later" = "Uppdatera senare manuellt"; "search_hotel_filter_apartment" = "Lägenheter"; @@ -1883,8 +1874,29 @@ "search_hotel_filter_resort" = "Resorter"; -"search_hotel_filter_motel" = "Motel"; +"search_hotel_filter_hotel" = "Hotell"; -"on" = "On"; +"search_hotel_filter_motel" = "Motell"; -"off" = "Off"; +"create_campaign_button" = "Gör anspråk på det här företaget"; + +"view_campaign_button" = "Företaget marknadsförs"; + +"search_hotel_filters_type" = "Typ"; + +/* Settings: "Send general feedback" button */ +"feedback_general" = "Allmän feedback"; + +"on" = "På"; + +"off" = "Av"; + +"prefs_languages_information" = "Vi använder TTS-system för röstinstruktioner. Flera Android-enheter använder Google TTS. Du kan ladda ned eller uppdatera det på Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)"; + +"prefs_languages_information_off" = "För arabiska, grekiska och rumänska måste du kanske installera ytterligare TTS (eftersom Google TTS inte stödjer dessa språk ännu) från Google Play, som till exempel Vocalizer TTS eller SVOX Classics.\nFör att hantera talsyntesinställningar på din enhet, öppna Inställningar –> Språk och inmatning –> Tal –> Text till tal-uppspelning. Här kan du ladda ned flera språkpaket eller välja den text till tal-motor som du föredrar."; + +"prefs_languages_information_off_link" = "Kolla in den här guiden för mer information."; + +"whatsnew_transliteration_title" = "Transkribering till latin"; + +"whatsnew_transliteration_message" = "Om en gata eller ett objekt saknar ett namn på ditt språk kommer det att stavas med det latinska alfabetet."; diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings index 68a6375ba3..f3d6e358dc 100644 --- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings @@ -473,14 +473,6 @@ /* Settings information group in settings screen */ "prefs_group_information" = "Information"; -/* Settings languages information in voice instructions screen */ -"prefs_languages_information" = "Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.)."; - -/* Settings languages off information in voice instructions screen */ -"prefs_languages_information_off" = "For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine."; - -"prefs_languages_information_off_link" = "For more information please check the guide."; - /* Settings screen: "Map" category title */ "prefs_group_map" = "แผนที่"; @@ -634,9 +626,6 @@ /* Settings: Send feedback button and dialog title */ "feedback" = "ข้อเสนอแนะ"; -/* Settings: "Send general feedback" button */ -"feedback_general" = "General Feedback"; - /* Text in menu */ "subscribe_to_news" = "สมัครรับข่าวของเรา"; @@ -1666,7 +1655,8 @@ "booking_filters_reset" = "รีเซ็ต"; -"booking_filters_rating" = "อันดับ"; +/* Beginning from a particular value and */ +"booking_filters_rating" = "คะแนนตั้งแต่"; "booking_filters_rating_any" = "อะไรก็ได้"; @@ -1714,7 +1704,8 @@ "dialog_taxi_error" = "ไม่สามารถทำการจองแท็กซี่ได้ชั่วคราว"; -"advertisement" = "โฆษณา"; +/* Abbreviated for all languages. */ +"advertisement" = "AD"; "mobile_data_dialog" = "ใช้อินเทอร์เน็ตมือถือแสดงข้อมูลโดยรายละเอียดหรือไม่?"; @@ -1861,15 +1852,15 @@ "booking_search" = "Booking.com"; -"whats_new_auto_update_updating_maps" = "Updating maps"; +"whats_new_auto_update_updating_maps" = "กำลังอัปเดตแผนที่"; -"whats_new_auto_update_title" = "Update your downloaded maps"; +"whats_new_auto_update_title" = "อัปเดตแผนที่ที่คุณดาวน์โหลดมา"; -"whats_new_auto_update_message" = "Update maps supports information about objects in the current state"; +"whats_new_auto_update_message" = "การอัปเดตแผนที่จะคงข้อมูลเกี่ยวกับจุดหมายต่าง ๆ ให้ล่าสุดอยู่เสมอ"; -"whats_new_auto_update_button_size" = "Update (%s)"; +"whats_new_auto_update_button_size" = "อัปเดต (%s)"; -"whats_new_auto_update_button_later" = "Manually update later"; +"whats_new_auto_update_button_later" = "อัปเดตด้วยตนเองภายหลัง"; "search_hotel_filter_apartment" = "อพาร์ตเมนต์"; @@ -1883,8 +1874,29 @@ "search_hotel_filter_resort" = "รีสอร์ต"; -"search_hotel_filter_motel" = "Motel"; +"search_hotel_filter_hotel" = "โรงแรม"; -"on" = "On"; +"search_hotel_filter_motel" = "โมเต็ล"; -"off" = "Off"; +"create_campaign_button" = "อ้างสิทธิ์ในธุรกิจนี้"; + +"view_campaign_button" = "ธุรกิจได้รับการโฆษณาแล้ว"; + +"search_hotel_filters_type" = "ประเภท"; + +/* Settings: "Send general feedback" button */ +"feedback_general" = "ข้อเสนอแนะทั่วไป"; + +"on" = "เปิด"; + +"off" = "ปิด"; + +"prefs_languages_information" = "เราใช้ระบบ TTS สำหรับคำแนะนำด้วยเสียงพูด เครื่องแอนดรอยด์จำนวนมากใช้งาน Google TTS คุณสามารถดาวน์โหลดหรืออัปเดตได้จาก Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)"; + +"prefs_languages_information_off" = "สำหรับภาษาอาหรับ กรีก และโรมาเนีย คุณอาจจำเป็นต้องติดตั้ง TTS (เนื่องจาก Google TTS ยังไม่ได้รองรับภาษาเหล่านี้) เพิ่มเติมจาก Google Play อย่างเช่น Vocalizer TTS หรือ SVOX Classics\nในการที่จะจัดการการตั้งค่าสำหรับการสังเคราะห์เสียงพูด เปิด การตั้งค่า –> ภาษาและอินพุต –> เสียงพูด –> เอาท์พุตการแปลงข้อความไปเป็นเสียงพูด บนเครื่องของคุณ ซึ่งคุณสามารถดาวน์โหลดชุดภาษาเพิ่มเติมหรือเลือกเอนจินการแปลงข้อความไปเป็นเสียงพูดที่ชอบได้"; + +"prefs_languages_information_off_link" = "สำหรับข้อมูลเพิ่มเติม กรุณาเข้าชมคำแนะนำนี้"; + +"whatsnew_transliteration_title" = "การทับศัพท์เป็นภาษาละติน"; + +"whatsnew_transliteration_message" = "หากถนนหรือเป้าหมายไม่มีชื่อในภาษาของคุณก็จะสะกดโดยใช้ตัวอักษรละติน"; diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings index 99cafe2521..6fbc79b15b 100644 --- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings @@ -473,14 +473,6 @@ /* Settings information group in settings screen */ "prefs_group_information" = "Information"; -/* Settings languages information in voice instructions screen */ -"prefs_languages_information" = "Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.)."; - -/* Settings languages off information in voice instructions screen */ -"prefs_languages_information_off" = "For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine."; - -"prefs_languages_information_off_link" = "For more information please check the guide."; - /* Settings screen: "Map" category title */ "prefs_group_map" = "Harita"; @@ -634,9 +626,6 @@ /* Settings: Send feedback button and dialog title */ "feedback" = "Geri Bildirim"; -/* Settings: "Send general feedback" button */ -"feedback_general" = "General Feedback"; - /* Text in menu */ "subscribe_to_news" = "Haberlerimize abone ol"; @@ -1666,7 +1655,8 @@ "booking_filters_reset" = "Sıfırla"; -"booking_filters_rating" = "Oy Verin"; +/* Beginning from a particular value and */ +"booking_filters_rating" = "En düşük derece"; "booking_filters_rating_any" = "Herhangi biri"; @@ -1714,7 +1704,8 @@ "dialog_taxi_error" = "Taksi çağırma geçici olarak kullanılamıyor."; -"advertisement" = "Reklam"; +/* Abbreviated for all languages. */ +"advertisement" = "AD"; "mobile_data_dialog" = "Ayrıntılı bilgileri görüntülemek için mobil internet kullanılsın mı?"; @@ -1861,15 +1852,15 @@ "booking_search" = "Booking.com"; -"whats_new_auto_update_updating_maps" = "Updating maps"; +"whats_new_auto_update_updating_maps" = "Haritalar güncelleniyor"; -"whats_new_auto_update_title" = "Update your downloaded maps"; +"whats_new_auto_update_title" = "İndirdiğiniz haritaları güncelleyin"; -"whats_new_auto_update_message" = "Update maps supports information about objects in the current state"; +"whats_new_auto_update_message" = "Haritaları güncellemek, nesnelerle ilgili bilgilerin güncel kalmasını sağlar"; -"whats_new_auto_update_button_size" = "Update (%s)"; +"whats_new_auto_update_button_size" = "Güncelle (%s)"; -"whats_new_auto_update_button_later" = "Manually update later"; +"whats_new_auto_update_button_later" = "Daha sonra manüel olarak güncelle"; "search_hotel_filter_apartment" = "Apart otel"; @@ -1883,8 +1874,29 @@ "search_hotel_filter_resort" = "Tatil köyü"; +"search_hotel_filter_hotel" = "Otel"; + "search_hotel_filter_motel" = "Motel"; -"on" = "On"; +"create_campaign_button" = "Bu iş yerinin sahibiyim"; -"off" = "Off"; +"view_campaign_button" = "İşletme reklamı verildi"; + +"search_hotel_filters_type" = "Tür"; + +/* Settings: "Send general feedback" button */ +"feedback_general" = "Genel Geribildirim"; + +"on" = "Aç"; + +"off" = "Kapat"; + +"prefs_languages_information" = "Sesli talimatlar için TTS sistemini kullanıyoruz. Çoğu Android cihaz, Google TTS'yi kullanıyor, Uygulamayı, Google Play'den indirebilir veya güncelleyebilirsiniz (https://play.google.com/store/apps/details?id=com.google.android.tts)"; + +"prefs_languages_information_off" = "Arapça, Yunanca ve Rumence dilleri için Google Play'den Vocalizer TTS veya SVOX Classics gibi ek TTS (Google TTS, henüz bu dilleri desteklememektedir) uygulamalarını yüklemeniz gerekebilir. Ses sentezi ayarlarını yönetmek için cihazınızda Ayarlar -> Dil ve giriş -> Konuşma -> Konuşmayı metne dönüştür seçeneklerini etkinleştirin. Buradan, ek dil paketini indirebilir veya tercih ettiğiniz metin okuma motorunu seçebilirsiniz."; + +"prefs_languages_information_off_link" = "Daha fazla bilgi için lütfen bu kılavuzu inceleyin."; + +"whatsnew_transliteration_title" = "Latince alfabesine çevirme"; + +"whatsnew_transliteration_message" = "Bir caddenin veya bir nesnenin adının kendi dilinizde mevcut olmaması durumunda, Latin alfabesi kullanılarak yazılır."; diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings index 4d8258a1e9..8418981b06 100644 --- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings @@ -473,14 +473,6 @@ /* Settings information group in settings screen */ "prefs_group_information" = "Information"; -/* Settings languages information in voice instructions screen */ -"prefs_languages_information" = "Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.)."; - -/* Settings languages off information in voice instructions screen */ -"prefs_languages_information_off" = "For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine."; - -"prefs_languages_information_off_link" = "For more information please check the guide."; - /* Settings screen: "Map" category title */ "prefs_group_map" = "Карта"; @@ -634,9 +626,6 @@ /* Settings: Send feedback button and dialog title */ "feedback" = "Відгук"; -/* Settings: "Send general feedback" button */ -"feedback_general" = "General Feedback"; - /* Text in menu */ "subscribe_to_news" = "Email-бюлетень"; @@ -1666,7 +1655,8 @@ "booking_filters_reset" = "Скинути"; -"booking_filters_rating" = "Рейтинг"; +/* Beginning from a particular value and */ +"booking_filters_rating" = "Рейтинг від"; "booking_filters_rating_any" = "Будь-який"; @@ -1714,7 +1704,8 @@ "dialog_taxi_error" = "Замовлення таксі тимчасово недоступне."; -"advertisement" = "Реклама"; +/* Abbreviated for all languages. */ +"advertisement" = "AD"; "mobile_data_dialog" = "Використовувати мобільні дані для перегляду докладної інформації?"; @@ -1861,15 +1852,15 @@ "booking_search" = "Booking.com"; -"whats_new_auto_update_updating_maps" = "Updating maps"; +"whats_new_auto_update_updating_maps" = "Оновлення карт"; -"whats_new_auto_update_title" = "Update your downloaded maps"; +"whats_new_auto_update_title" = "Оновити завантажені карти"; -"whats_new_auto_update_message" = "Update maps supports information about objects in the current state"; +"whats_new_auto_update_message" = "Оновлення карт дозволяє підтримувати інформацію про об'єкти в актуальному стані"; -"whats_new_auto_update_button_size" = "Update (%s)"; +"whats_new_auto_update_button_size" = "Оновити (%s)"; -"whats_new_auto_update_button_later" = "Manually update later"; +"whats_new_auto_update_button_later" = "Оновити вручну пізніше"; "search_hotel_filter_apartment" = "Апартаменти"; @@ -1883,8 +1874,29 @@ "search_hotel_filter_resort" = "Будинок відпочинку"; -"search_hotel_filter_motel" = "Motel"; +"search_hotel_filter_hotel" = "Готель"; -"on" = "On"; +"search_hotel_filter_motel" = "Мотель"; -"off" = "Off"; +"create_campaign_button" = "Я — власник"; + +"view_campaign_button" = "Ця компанія рекламується"; + +"search_hotel_filters_type" = "Тип"; + +/* Settings: "Send general feedback" button */ +"feedback_general" = "Загальний відгук"; + +"on" = "Увімкн."; + +"off" = "Вимкн."; + +"prefs_languages_information" = "Для озвучування голосових інструкцій ми використовуємо систему TTS. Більшість Android-пристроїв підтримують систему Google TTS. Для завантаження або оновлення перейдіть до магазину Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)"; + +"prefs_languages_information_off" = "Для арабської, грецької та румунської мов можливо вам знадобиться встановити додаткову систему TTS (наразі Google TTS не підтримує ці мови) з магазину Google Play — наприклад, Vocalizer TTS або SVOX Classics.\nДля управління налаштуваннями синтезу мови відкрийте на вашому пристрої Налаштування –> Мова та введення –> Мовлення –> Перетворення тексту на мовлення. Тут ви можете завантажити додатковий мовний пакет або вибрати інструмент для перетворення тексту на мовлення."; + +"prefs_languages_information_off_link" = "Додаткову інформацію див. у цьому керівництві."; + +"whatsnew_transliteration_title" = "Транслітерація латинськими літерами"; + +"whatsnew_transliteration_message" = "Якщо для вулиці чи об\\'єкта відсутня назва українською мовою, використовуватиметься назва, транслітерована латинськими літерами."; diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings index 17819c9560..f802f4bba7 100644 --- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings @@ -473,14 +473,6 @@ /* Settings information group in settings screen */ "prefs_group_information" = "Information"; -/* Settings languages information in voice instructions screen */ -"prefs_languages_information" = "Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.)."; - -/* Settings languages off information in voice instructions screen */ -"prefs_languages_information_off" = "For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine."; - -"prefs_languages_information_off_link" = "For more information please check the guide."; - /* Settings screen: "Map" category title */ "prefs_group_map" = "Bản đồ"; @@ -634,9 +626,6 @@ /* Settings: Send feedback button and dialog title */ "feedback" = "Phản hồi"; -/* Settings: "Send general feedback" button */ -"feedback_general" = "General Feedback"; - /* Text in menu */ "subscribe_to_news" = "Đăng ký nhận tin tức của chúng tôi"; @@ -1666,7 +1655,8 @@ "booking_filters_reset" = "Đặt lại"; -"booking_filters_rating" = "Cho điểm"; +/* Beginning from a particular value and */ +"booking_filters_rating" = "Hạng từ"; "booking_filters_rating_any" = "Bất kỳ"; @@ -1714,7 +1704,8 @@ "dialog_taxi_error" = "Gọi taxi tạm thời không khả dụng."; -"advertisement" = "Quảng cáo"; +/* Abbreviated for all languages. */ +"advertisement" = "AD"; "mobile_data_dialog" = "Sử dụng mạng Internet di động để hiển thị thông tin chi tiết?"; @@ -1861,15 +1852,15 @@ "booking_search" = "Booking.com"; -"whats_new_auto_update_updating_maps" = "Updating maps"; +"whats_new_auto_update_updating_maps" = "Đang cập nhật bản đồ"; -"whats_new_auto_update_title" = "Update your downloaded maps"; +"whats_new_auto_update_title" = "Cập nhật các bản đồ đã tải về của bạn"; -"whats_new_auto_update_message" = "Update maps supports information about objects in the current state"; +"whats_new_auto_update_message" = "Cập nhật bản đồ để cập nhật thông tin về các đối tượng trên đó"; -"whats_new_auto_update_button_size" = "Update (%s)"; +"whats_new_auto_update_button_size" = "Cập nhật (%s)"; -"whats_new_auto_update_button_later" = "Manually update later"; +"whats_new_auto_update_button_later" = "Cập nhật thủ công sau"; "search_hotel_filter_apartment" = "Căn hộ"; @@ -1883,8 +1874,29 @@ "search_hotel_filter_resort" = "Khu nghỉ dưỡng"; -"search_hotel_filter_motel" = "Motel"; +"search_hotel_filter_hotel" = "Khách sạn"; -"on" = "On"; +"search_hotel_filter_motel" = "Nhà nghỉ"; -"off" = "Off"; +"create_campaign_button" = "Tôi là chủ doanh nghiệp này"; + +"view_campaign_button" = "Doanh nghiệp này được quảng cáo"; + +"search_hotel_filters_type" = "Loại"; + +/* Settings: "Send general feedback" button */ +"feedback_general" = "Phản hồi chung"; + +"on" = "Bật"; + +"off" = "Tắt"; + +"prefs_languages_information" = "Chúng tôi sử dụng TTS hệ thống để hướng dẫn bằng giọng nói. Rất nhiều thiết bị Android sử dụng Google TTS, bạn có thể tải về hoặc cập nhật nó từ Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)"; + +"prefs_languages_information_off" = "Đối với tiếng Ả Rập, tiếng Hy Lạp và tiếng Rumani, bạn có thể cần cài đặt thêm TTS (bởi Google TTS chưa hỗ trợ các ngôn ngữ này) từ Google Play như Vocalizer TTS hoặc SVOX Classics.\nĐể quản lý các thiết lập tổng hợp giọng nói, trên thiết bị của bạn mở Cài đặt –> Ngôn ngữ và nhập liệu –> Giọng nói –> Đầu ra văn bản thành giọng nói. Ở đây bạn có thể tải về thêm các gói ngôn ngữ và lựa chọn công cụ chuyển văn bản thành giọng nói ưa thích."; + +"prefs_languages_information_off_link" = "Để biết thêm thông tin, vui lòng kiểm tra bài hướng dẫn này."; + +"whatsnew_transliteration_title" = "Chuyển ngữ sang chữ Latinh"; + +"whatsnew_transliteration_message" = "Nếu một đường phố hoặc đối tượng không có tên trong ngôn ngữ của bạn, nó sẽ được đánh vần sử dụng bảng chữ cái alphabet."; diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings index 9b9ec4baea..4a325cadea 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings @@ -473,14 +473,6 @@ /* Settings information group in settings screen */ "prefs_group_information" = "Information"; -/* Settings languages information in voice instructions screen */ -"prefs_languages_information" = "Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.)."; - -/* Settings languages off information in voice instructions screen */ -"prefs_languages_information_off" = "For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine."; - -"prefs_languages_information_off_link" = "For more information please check the guide."; - /* Settings screen: "Map" category title */ "prefs_group_map" = "地图"; @@ -634,9 +626,6 @@ /* Settings: Send feedback button and dialog title */ "feedback" = "反馈"; -/* Settings: "Send general feedback" button */ -"feedback_general" = "General Feedback"; - /* Text in menu */ "subscribe_to_news" = "订阅我们的新闻"; @@ -1666,7 +1655,8 @@ "booking_filters_reset" = "重置"; -"booking_filters_rating" = "评分"; +/* Beginning from a particular value and */ +"booking_filters_rating" = "最低评分"; "booking_filters_rating_any" = "任意"; @@ -1714,7 +1704,8 @@ "dialog_taxi_error" = "叫出租车服务暂时无法使用。"; -"advertisement" = "广告"; +/* Abbreviated for all languages. */ +"advertisement" = "AD"; "mobile_data_dialog" = "使用移动网络显示详细信息？"; @@ -1861,15 +1852,15 @@ "booking_search" = "Booking.com"; -"whats_new_auto_update_updating_maps" = "Updating maps"; +"whats_new_auto_update_updating_maps" = "正在更新地图"; -"whats_new_auto_update_title" = "Update your downloaded maps"; +"whats_new_auto_update_title" = "更新已下载的地图"; -"whats_new_auto_update_message" = "Update maps supports information about objects in the current state"; +"whats_new_auto_update_message" = "更新地图可以让对象的信息保持最新状态"; -"whats_new_auto_update_button_size" = "Update (%s)"; +"whats_new_auto_update_button_size" = "更新 (%s)"; -"whats_new_auto_update_button_later" = "Manually update later"; +"whats_new_auto_update_button_later" = "稍后手动更新"; "search_hotel_filter_apartment" = "公寓"; @@ -1883,8 +1874,29 @@ "search_hotel_filter_resort" = "度假村"; -"search_hotel_filter_motel" = "Motel"; +"search_hotel_filter_hotel" = "旅店"; -"on" = "On"; +"search_hotel_filter_motel" = "汽车旅馆"; -"off" = "Off"; +"create_campaign_button" = "认领此商家"; + +"view_campaign_button" = "商家已推广"; + +"search_hotel_filters_type" = "类型"; + +/* Settings: "Send general feedback" button */ +"feedback_general" = "一般反馈"; + +"on" = "开"; + +"off" = "关"; + +"prefs_languages_information" = "我们为语音指令使用“文字转语音”系统。许多 Android 设备使用 Google 文字转语音，您可以从 Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) 下载或更新这一功能"; + +"prefs_languages_information_off" = "对于阿拉伯语、希腊语和罗马尼亚语，您需要从 Google Play 中安装其他“文字转语音”功能（因为 Google 文字转语音不支持这些语言），例如 Vocalizer TTS 或 SVOX Classics。\n要管理语音合成的设置，请在您的设备上打开“设置 –> 语言和输入法 –> 语音 –> 文字转语音 (TTS) 输出”。您可以从这里下载其他语言包或选择首先的文字转语音引擎。"; + +"prefs_languages_information_off_link" = "如需了解更多信息，请查阅此指南。"; + +"whatsnew_transliteration_title" = "直译成拉丁文"; + +"whatsnew_transliteration_message" = "如果某条街道或者某个对象在您的语言中没有对应的名称，它将使用拉丁字母拼写。"; diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings index e2fe2b32be..61e267fd7d 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings @@ -473,14 +473,6 @@ /* Settings information group in settings screen */ "prefs_group_information" = "Information"; -/* Settings languages information in voice instructions screen */ -"prefs_languages_information" = "Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.)."; - -/* Settings languages off information in voice instructions screen */ -"prefs_languages_information_off" = "For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine."; - -"prefs_languages_information_off_link" = "For more information please check the guide."; - /* Settings screen: "Map" category title */ "prefs_group_map" = "地圖"; @@ -634,9 +626,6 @@ /* Settings: Send feedback button and dialog title */ "feedback" = "意見反應"; -/* Settings: "Send general feedback" button */ -"feedback_general" = "一般意見反應"; - /* Text in menu */ "subscribe_to_news" = "訂閱我們的新聞"; @@ -1666,7 +1655,8 @@ "booking_filters_reset" = "重設"; -"booking_filters_rating" = "評分"; +/* Beginning from a particular value and */ +"booking_filters_rating" = "評分下限"; "booking_filters_rating_any" = "任意"; @@ -1714,7 +1704,8 @@ "dialog_taxi_error" = "叫計程車服務暫時無法使用。"; -"advertisement" = "廣告"; +/* Abbreviated for all languages. */ +"advertisement" = "AD"; "mobile_data_dialog" = "使用手機網路顯示詳細資訊？"; @@ -1861,15 +1852,15 @@ "booking_search" = "Booking.com"; -"whats_new_auto_update_updating_maps" = "Updating maps"; +"whats_new_auto_update_updating_maps" = "更新地圖"; -"whats_new_auto_update_title" = "Update your downloaded maps"; +"whats_new_auto_update_title" = "更新您下載的地圖"; -"whats_new_auto_update_message" = "Update maps supports information about objects in the current state"; +"whats_new_auto_update_message" = "更新地圖以讓物件資訊保持在最新狀態"; -"whats_new_auto_update_button_size" = "Update (%s)"; +"whats_new_auto_update_button_size" = "更新 (%s)"; -"whats_new_auto_update_button_later" = "Manually update later"; +"whats_new_auto_update_button_later" = "稍後手動更新"; "search_hotel_filter_apartment" = "公寓"; @@ -1883,8 +1874,29 @@ "search_hotel_filter_resort" = "度假酒店"; -"search_hotel_filter_motel" = "Motel"; +"search_hotel_filter_hotel" = "飯店"; -"on" = "On"; +"search_hotel_filter_motel" = "汽車旅館"; -"off" = "Off"; +"create_campaign_button" = "聲明這是你的公司"; + +"view_campaign_button" = "業務已發出廣告"; + +"search_hotel_filters_type" = "類型"; + +/* Settings: "Send general feedback" button */ +"feedback_general" = "一般反應"; + +"on" = "開"; + +"off" = "關"; + +"prefs_languages_information" = "我們使用系統 TTS 提供語音指示。許多 Android 裝置使用 Google TTS，您可從 Google Play 下載或更新 (https://play.google.com/store/apps/details?id=com.google.android.tts)"; + +"prefs_languages_information_off" = "對於阿拉伯語、希臘語或羅馬尼亞語，必須從 Google Play 下載 Vocalizer TTS 或 SVOX Classics 等其他 TTS (因為 Google TTS 尚未支援這些語言)。\n若要管理語音合成的設定，請在您的裝置上開啟「設定 –> 語言和輸入 –> 語音 –> 文字轉語音輸出」。您可在此下載其他語言套件，或選擇偏好的文字轉語音引擎。"; + +"prefs_languages_information_off_link" = "如需更多資訊，請參閱本指南。"; + +"whatsnew_transliteration_title" = "音譯為拉丁文"; + +"whatsnew_transliteration_message" = "若街道或物件沒有您語言的名稱，會使用拉丁字母拼出。"; diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 9b6c8862d8..988780510a 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -317,6 +317,9 @@ 34943BBA1E2626B200B14F84 /* WelcomePageController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34943BB91E2626B200B14F84 /* WelcomePageController.swift */; }; 34943BBB1E2626B200B14F84 /* WelcomePageController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34943BB91E2626B200B14F84 /* WelcomePageController.swift */; }; 34943BBC1E2626B200B14F84 /* WelcomePageController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34943BB91E2626B200B14F84 /* WelcomePageController.swift */; }; + 3495433D1EB22D9600F08F73 /* MPAdBrowserController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3495433C1EB22D9600F08F73 /* MPAdBrowserController.xib */; }; + 3495433E1EB22DAC00F08F73 /* MPAdBrowserController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3495433C1EB22D9600F08F73 /* MPAdBrowserController.xib */; }; + 3495433F1EB22DAD00F08F73 /* MPAdBrowserController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3495433C1EB22D9600F08F73 /* MPAdBrowserController.xib */; }; 3497A93A1B5CF8A900F51E55 /* MWMNavigationDashboardManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3497A9371B5CF8A900F51E55 /* MWMNavigationDashboardManager.mm */; }; 349A13821DEC138C00C7DB60 /* MWMMobileInternetAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = 349A13801DEC138C00C7DB60 /* MWMMobileInternetAlert.mm */; }; 349A13831DEC138C00C7DB60 /* MWMMobileInternetAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = 349A13801DEC138C00C7DB60 /* MWMMobileInternetAlert.mm */; }; @@ -918,6 +921,9 @@ F6558DA21E642CC0002203AE /* MWMFacilitiesController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6558DA01E642CC0002203AE /* MWMFacilitiesController.mm */; }; F6558DA31E642CC0002203AE /* MWMFacilitiesController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6558DA01E642CC0002203AE /* MWMFacilitiesController.mm */; }; F6588E2C1B15C26700EE1E58 /* MWMTextView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6588E2B1B15C26700EE1E58 /* MWMTextView.mm */; }; + F660DEE41EAF4F59004DC056 /* MWMLocationManager+SpeedAndAltitude.swift in Sources */ = {isa = PBXBuildFile; fileRef = F660DEE31EAF4F59004DC056 /* MWMLocationManager+SpeedAndAltitude.swift */; }; + F660DEE51EAF4F59004DC056 /* MWMLocationManager+SpeedAndAltitude.swift in Sources */ = {isa = PBXBuildFile; fileRef = F660DEE31EAF4F59004DC056 /* MWMLocationManager+SpeedAndAltitude.swift */; }; + F660DEE61EAF4F59004DC056 /* MWMLocationManager+SpeedAndAltitude.swift in Sources */ = {isa = PBXBuildFile; fileRef = F660DEE31EAF4F59004DC056 /* MWMLocationManager+SpeedAndAltitude.swift */; }; F6664BF91E6459CB00E703C2 /* PPFacilityCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6664BF71E6459CB00E703C2 /* PPFacilityCell.swift */; }; F6664BFA1E6459CB00E703C2 /* PPFacilityCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6664BF71E6459CB00E703C2 /* PPFacilityCell.swift */; }; F6664BFB1E6459CB00E703C2 /* PPFacilityCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6664BF71E6459CB00E703C2 /* PPFacilityCell.swift */; }; @@ -1761,6 +1767,7 @@ 34926BE51EA4C2A700DCF14C /* SearchBanners.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchBanners.swift; sourceTree = ""; }; 34943BB51E26222300B14F84 /* WelcomeProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WelcomeProtocol.swift; sourceTree = ""; }; 34943BB91E2626B200B14F84 /* WelcomePageController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WelcomePageController.swift; sourceTree = ""; }; + 3495433C1EB22D9600F08F73 /* MPAdBrowserController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MPAdBrowserController.xib; path = 3party/MoPubSDK/Internal/Common/MPAdBrowserController.xib; sourceTree = ""; }; 3497A9361B5CF8A900F51E55 /* MWMNavigationDashboardManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMNavigationDashboardManager.h; sourceTree = ""; }; 3497A9371B5CF8A900F51E55 /* MWMNavigationDashboardManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMNavigationDashboardManager.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 349A137F1DEC138C00C7DB60 /* MWMMobileInternetAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMobileInternetAlert.h; sourceTree = ""; }; @@ -2074,6 +2081,7 @@ F6558DA01E642CC0002203AE /* MWMFacilitiesController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMFacilitiesController.mm; sourceTree = ""; }; F6588E2A1B15C26700EE1E58 /* MWMTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMTextView.h; sourceTree = ""; }; F6588E2B1B15C26700EE1E58 /* MWMTextView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMTextView.mm; sourceTree = ""; }; + F660DEE31EAF4F59004DC056 /* MWMLocationManager+SpeedAndAltitude.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "MWMLocationManager+SpeedAndAltitude.swift"; sourceTree = ""; }; F6664BF71E6459CB00E703C2 /* PPFacilityCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PPFacilityCell.swift; sourceTree = ""; }; F6664BF81E6459CB00E703C2 /* PPFacilityCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PPFacilityCell.xib; sourceTree = ""; }; F6664BFF1E6459DA00E703C2 /* PPReviewHeaderCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PPReviewHeaderCell.swift; sourceTree = ""; }; @@ -2791,6 +2799,7 @@ 3404752A1E081A4600C92850 /* MWMLocationHelpers.h */, 3404752B1E081A4600C92850 /* MWMLocationManager.h */, 3404752C1E081A4600C92850 /* MWMLocationManager.mm */, + F660DEE31EAF4F59004DC056 /* MWMLocationManager+SpeedAndAltitude.swift */, 3404752D1E081A4600C92850 /* MWMLocationObserver.h */, 3404752E1E081A4600C92850 /* MWMLocationPredictor.h */, 3404752F1E081A4600C92850 /* MWMLocationPredictor.mm */, @@ -4266,6 +4275,7 @@ FA46DA2B12D4166E00968C36 /* countries.txt */, FA85F632145DDDC20090E1A0 /* packed_polygons.bin */, EE026F0511D6AC0D00645242 /* classificator.txt */, + 3495433C1EB22D9600F08F73 /* MPAdBrowserController.xib */, ); name = "External Resources"; sourceTree = ""; @@ -4500,6 +4510,7 @@ F6E2FEAB1E097BA00083EBEC /* _MWMPPPBooking.xib in Resources */, F6E2FEAE1E097BA00083EBEC /* _MWMPPPExternalTitle.xib in Resources */, F6E2FEB11E097BA00083EBEC /* _MWMPPPSchedule.xib in Resources */, + 3495433E1EB22DAC00F08F73 /* MPAdBrowserController.xib in Resources */, F6E2FEB41E097BA00083EBEC /* _MWMPPPSpace.xib in Resources */, F6E2FEB71E097BA00083EBEC /* _MWMPPPSubtitle.xib in Resources */, F6E2FEBA1E097BA00083EBEC /* _MWMPPPTitle.xib in Resources */, @@ -4654,6 +4665,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 3495433D1EB22D9600F08F73 /* MPAdBrowserController.xib in Resources */, 6741A9531BF340DE002C974C /* 01_dejavusans.ttf in Resources */, 6741A9541BF340DE002C974C /* 02_droidsans-fallback.ttf in Resources */, 6741A9571BF340DE002C974C /* 03_jomolhari-id-a3d.ttf in Resources */, @@ -4840,6 +4852,7 @@ F6E2FEB61E097BA00083EBEC /* _MWMPPPSpace.xib in Resources */, F6E2FEB91E097BA00083EBEC /* _MWMPPPSubtitle.xib in Resources */, 4554B6EF1E55F0F40084017F /* drules_proto_vehicle_dark.bin in Resources */, + 3495433F1EB22DAD00F08F73 /* MPAdBrowserController.xib in Resources */, F6E2FEBC1E097BA00083EBEC /* _MWMPPPTitle.xib in Resources */, 849CF6441DE842290024A8A5 /* AddSetTableViewCell.xib in Resources */, 340E1EED1E2F614400CE49BF /* Authorization.storyboard in Resources */, @@ -5274,6 +5287,7 @@ 3490D2E01CE9DD2500D0B838 /* MWMSideButtonsView.mm in Sources */, 340475491E081A4600C92850 /* AppInfo.mm in Sources */, 34F4072B1E9E1AFF00E57AC0 /* Banner.swift in Sources */, + F660DEE41EAF4F59004DC056 /* MWMLocationManager+SpeedAndAltitude.swift in Sources */, F6E2FDF11E097BA00083EBEC /* MWMOpeningHoursAddScheduleTableViewCell.mm in Sources */, F6E2FD821E097BA00083EBEC /* MWMMapDownloaderSearchDataSource.mm in Sources */, F6664C011E6459DA00E703C2 /* PPReviewHeaderCell.swift in Sources */, @@ -5571,6 +5585,7 @@ 349B926D1DF0518E007779DD /* MWMToast.mm in Sources */, 3404754A1E081A4600C92850 /* AppInfo.mm in Sources */, 34F4072C1E9E1AFF00E57AC0 /* Banner.swift in Sources */, + F660DEE51EAF4F59004DC056 /* MWMLocationManager+SpeedAndAltitude.swift in Sources */, F6E2FDF21E097BA00083EBEC /* MWMOpeningHoursAddScheduleTableViewCell.mm in Sources */, F6E2FD831E097BA00083EBEC /* MWMMapDownloaderSearchDataSource.mm in Sources */, 3490D2E11CE9DD2500D0B838 /* MWMSideButtonsView.mm in Sources */, @@ -5868,6 +5883,7 @@ 849CF6F11DE842290024A8A5 /* MWMCircularProgress.mm in Sources */, 849CF6F31DE842290024A8A5 /* MWMButton.mm in Sources */, 34F4072D1E9E1AFF00E57AC0 /* Banner.swift in Sources */, + F660DEE61EAF4F59004DC056 /* MWMLocationManager+SpeedAndAltitude.swift in Sources */, F6E2FDF31E097BA00083EBEC /* MWMOpeningHoursAddScheduleTableViewCell.mm in Sources */, F6E2FD841E097BA00083EBEC /* MWMMapDownloaderSearchDataSource.mm in Sources */, F6664C031E6459DA00E703C2 /* PPReviewHeaderCell.swift in Sources */, diff --git a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderTableViewCell.mm b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderTableViewCell.mm index 4178aab7d3..9987513b36 100644 --- a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderTableViewCell.mm +++ b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderTableViewCell.mm @@ -80,7 +80,7 @@ case storage::NodeStatus::InQueue: case storage::NodeStatus::Partly: size = isModeDownloaded ? nodeAttrs.m_localMwmSize - : nodeAttrs.m_mwmSize - nodeAttrs.m_localMwmSize; + : nodeAttrs.m_mwmSize; break; case storage::NodeStatus::OnDisk: size = isModeDownloaded ? nodeAttrs.m_mwmSize : 0; break; } diff --git a/iphone/Maps/UI/Downloader/MWMBaseMapDownloaderViewController.mm b/iphone/Maps/UI/Downloader/MWMBaseMapDownloaderViewController.mm index a1a3ccb5c9..0033a6859c 100644 --- a/iphone/Maps/UI/Downloader/MWMBaseMapDownloaderViewController.mm +++ b/iphone/Maps/UI/Downloader/MWMBaseMapDownloaderViewController.mm @@ -292,8 +292,7 @@ using namespace mwm; self.allMapsButton.hidden = NO; [self.allMapsButton setTitle:[NSString stringWithFormat:kAllMapsLabelFormat, kDownloadAllActionTitle, - formattedSize(nodeAttrs.m_mwmSize - - nodeAttrs.m_localMwmSize)] + formattedSize(nodeAttrs.m_mwmSize)] forState:UIControlStateNormal]; self.allMapsCancelButton.hidden = YES; } @@ -570,7 +569,7 @@ using namespace mwm; s.GetNodeAttrs(m_actionSheetId, nodeAttrs); NSString * prefix = nodeAttrs.m_mwmCounter == 1 ? kDownloadActionTitle : kDownloadAllActionTitle; NSString * title = [NSString stringWithFormat:kAllMapsLabelFormat, prefix, - formattedSize(nodeAttrs.m_mwmSize - nodeAttrs.m_localMwmSize)]; + formattedSize(nodeAttrs.m_mwmSize)]; UIAlertAction * action = [UIAlertAction actionWithTitle:title style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) diff --git a/iphone/Maps/UI/Editor/MWMEditorViewController.mm b/iphone/Maps/UI/Editor/MWMEditorViewController.mm index 546a1a5189..0804ff6f7d 100644 --- a/iphone/Maps/UI/Editor/MWMEditorViewController.mm +++ b/iphone/Maps/UI/Editor/MWMEditorViewController.mm @@ -282,7 +282,7 @@ void registerCellsForTableView(vector const & cells, UITab noteInfo[kStatProblem] = self.note; CLLocation * location = [[CLLocation alloc] initWithLatitude:latLon.lat longitude:latLon.lon]; [Statistics logEvent:kStatEditorProblemReport withParameters:noteInfo atLocation:location]; - f.CreateNote(latLon, featureID, osm::Editor::NoteProblemType::General, self.note.UTF8String); + f.CreateNote(m_mapObject, osm::Editor::NoteProblemType::General, self.note.UTF8String); } switch (f.SaveEditedMapObject(m_mapObject)) @@ -410,7 +410,7 @@ void registerCellsForTableView(vector const & cells, UITab { m_sections.push_back(MWMEditorSectionAddress); m_cells[MWMEditorSectionAddress] = kSectionAddressCellTypes; - if (m_mapObject.IsBuilding()) + if (m_mapObject.IsBuilding() && !m_mapObject.IsPointType()) m_cells[MWMEditorSectionAddress].push_back(MWMPlacePageCellTypeBuildingLevels); registerCellsForTableView(kSectionAddressCellTypes, self.tableView); @@ -968,7 +968,7 @@ void registerCellsForTableView(vector const & cells, UITab kStatProblem : @(osm::Editor::kPlaceDoesNotExistMessage) } atLocation:location]; - GetFramework().CreateNote(latLon, fid, osm::Editor::NoteProblemType::PlaceDoesNotExist, + GetFramework().CreateNote(m_mapObject, osm::Editor::NoteProblemType::PlaceDoesNotExist, additional); [self backTap]; [self showDropDown]; diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageData.h b/iphone/Maps/UI/PlacePage/MWMPlacePageData.h index 996d442b5c..2d65aa6a92 100644 --- a/iphone/Maps/UI/PlacePage/MWMPlacePageData.h +++ b/iphone/Maps/UI/PlacePage/MWMPlacePageData.h @@ -1,11 +1,11 @@ -#import "SwiftBridge.h" +#include "local_ads/event.hpp" + +#include "partners_api/booking_api.hpp" #include "map/place_page_info.hpp" #include "std/vector.hpp" -#include "partners_api/booking_api.hpp" - @class MWMPlacePageData; namespace place_page @@ -14,12 +14,13 @@ enum class Sections { Preview, Bookmark, - Metainfo, - Buttons, HotelPhotos, HotelDescription, HotelFacilities, - HotelReviews + HotelReviews, + Metainfo, + Ad, + Buttons }; enum class PreviewRows @@ -70,6 +71,12 @@ enum class MetainfoRows Operator, Internet, Coordinate, + LocalAdsCandidate, + LocalAdsCustomer +}; + +enum class AdRows +{ Taxi }; @@ -79,11 +86,7 @@ enum class ButtonsRows EditPlace, AddPlace, HotelDescription, - BookingShowMoreFacilities, - BookingShowMoreOnSite, - BookingShowMoreReviews, - LocalAdsCandidate, - LocalAdsCustomer + Other }; enum class OpeningHours @@ -101,6 +104,7 @@ using BannerIsReady = void (^)(); @class MWMGalleryItemModel; +@protocol MWMBanner; /// ViewModel for place page. @interface MWMPlacePageData : NSObject @@ -156,6 +160,7 @@ using BannerIsReady = void (^)(); // Local Ads - (NSString *)localAdsURL; +- (void)logLocalAdsEvent:(local_ads::EventType)type; // Table view's data - (vector const &)sections; @@ -165,6 +170,7 @@ using BannerIsReady = void (^)(); - (vector const &)hotelFacilitiesRows; - (vector const &)hotelReviewsRows; - (vector const &)metainfoRows; +- (vector const &)adRows; - (vector const &)buttonsRows; // Table view metainfo rows diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm b/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm index a0111c162f..42ec05c491 100644 --- a/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm +++ b/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm @@ -1,6 +1,7 @@ #import "MWMPlacePageData.h" #import "AppInfo.h" #import "MWMBannerHelpers.h" +#import "MWMLocationManager.h" #import "MWMNetworkPolicy.h" #import "MWMSettings.h" #import "Statistics.h" @@ -39,6 +40,7 @@ using namespace place_page; vector m_sections; vector m_previewRows; vector m_metainfoRows; + vector m_adRows; vector m_buttonsRows; vector m_hotelPhotosRows; vector m_hotelDescriptionRows; @@ -62,6 +64,7 @@ using namespace place_page; m_sections.clear(); m_previewRows.clear(); m_metainfoRows.clear(); + m_adRows.clear(); m_buttonsRows.clear(); m_hotelPhotosRows.clear(); m_hotelDescriptionRows.clear(); @@ -79,6 +82,12 @@ using namespace place_page; m_sections.push_back(Sections::Metainfo); [self fillMetaInfoSection]; + if (m_info.IsReachableByTaxi()) + { + m_sections.push_back(Sections::Ad); + m_adRows.push_back(AdRows::Taxi); + } + // There is at least one of these buttons. if (m_info.ShouldShowAddPlace() || m_info.ShouldShowEditPlace() || m_info.ShouldShowAddBusiness() || m_info.IsSponsored()) @@ -92,7 +101,7 @@ using namespace place_page; { if (self.title.length) m_previewRows.push_back(PreviewRows::Title); if (self.externalTitle.length) m_previewRows.push_back(PreviewRows::ExternalTitle); - if (self.subtitle.length) m_previewRows.push_back(PreviewRows::Subtitle); + if (self.subtitle.length || self.isMyPosition) m_previewRows.push_back(PreviewRows::Subtitle); if (self.schedule != OpeningHours::Unknown) m_previewRows.push_back(PreviewRows::Schedule); if (self.isBooking) m_previewRows.push_back(PreviewRows::Booking); if (self.address.length) m_previewRows.push_back(PreviewRows::Address); @@ -104,6 +113,8 @@ using namespace place_page; __weak auto wSelf = self; [[MWMBannersCache cache] getWithCoreBanners:banner_helpers::MatchPriorityBanners(m_info.GetBanners()) + cacheOnly:NO + loadNew:YES completion:^(id ad, BOOL isAsync) { __strong auto self = wSelf; if (!self) @@ -113,8 +124,7 @@ using namespace place_page; self->m_previewRows.push_back(PreviewRows::Banner); if (isAsync) self.bannerIsReadyCallback(); - } - cacheOnly:NO]; + }]; } } @@ -153,8 +163,18 @@ using namespace place_page; m_metainfoRows.push_back(MetainfoRows::Address); m_metainfoRows.push_back(MetainfoRows::Coordinate); - if (m_info.IsReachableByTaxi()) - m_metainfoRows.push_back(MetainfoRows::Taxi); + + switch (m_info.GetLocalAdsStatus()) + { + case place_page::LocalAdsStatus::NotAvailable: break; + case place_page::LocalAdsStatus::Candidate: + m_metainfoRows.push_back(MetainfoRows::LocalAdsCandidate); + break; + case place_page::LocalAdsStatus::Customer: + m_metainfoRows.push_back(MetainfoRows::LocalAdsCustomer); + [self logLocalAdsEvent:local_ads::EventType::OpenInfo]; + break; + } } - (void)fillButtonsSection @@ -174,17 +194,6 @@ using namespace place_page; if (m_info.ShouldShowAddBusiness()) m_buttonsRows.push_back(ButtonsRows::AddBusiness); - - switch (m_info.GetLocalAdsStatus()) - { - case place_page::LocalAdsStatus::NotAvailable: break; - case place_page::LocalAdsStatus::Candidate: - m_buttonsRows.push_back(ButtonsRows::LocalAdsCandidate); - break; - case place_page::LocalAdsStatus::Customer: - m_buttonsRows.push_back(ButtonsRows::LocalAdsCustomer); - break; - } } - (void)fillOnlineBookingSections @@ -472,7 +481,6 @@ using namespace place_page; - (NSString *)bookmarkColor { return m_info.IsBookmark() ? @(m_info.m_bookmarkColorName.c_str()) : nil; - ; } - (NSString *)bookmarkDescription @@ -483,7 +491,6 @@ using namespace place_page; - (NSString *)bookmarkCategory { return m_info.IsBookmark() ? @(m_info.m_bookmarkCategoryName.c_str()) : nil; - ; } - (BookmarkAndCategory)bac; @@ -493,6 +500,23 @@ using namespace place_page; #pragma mark - Local Ads - (NSString *)localAdsURL { return @(m_info.GetLocalAdsUrl().c_str()); } +- (void)logLocalAdsEvent:(local_ads::EventType)type +{ + if (m_info.GetLocalAdsStatus() != place_page::LocalAdsStatus::Customer) + return; + auto const featureID = m_info.GetID(); + auto const & mwmInfo = featureID.m_mwmId.GetInfo(); + if (!mwmInfo) + return; + auto & f = GetFramework(); + auto location = [MWMLocationManager lastLocation]; + auto event = local_ads::Event(type, mwmInfo->GetVersion(), mwmInfo->GetCountryName(), + featureID.m_index, f.GetDrawScale(), + std::chrono::steady_clock::now(), location.coordinate.latitude, + location.coordinate.longitude, location.horizontalAccuracy); + f.GetLocalAdsManager().GetStatistics().RegisterEvent(std::move(event)); +} + #pragma mark - Getters - (NSString *)address { return @(m_info.GetAddress().c_str()); } @@ -501,6 +525,7 @@ using namespace place_page; - (vector const &)previewRows { return m_previewRows; } - (vector const &)metainfoRows { return m_metainfoRows; } - (vector &)mutableMetainfoRows { return m_metainfoRows; } +- (vector const &)adRows { return m_adRows; } - (vector const &)buttonsRows { return m_buttonsRows; } - (vector const &)photosRows { return m_hotelPhotosRows; } - (vector const &)descriptionRows { return m_hotelDescriptionRows; } @@ -510,7 +535,7 @@ using namespace place_page; { switch (row) { - case MetainfoRows::Taxi: + case MetainfoRows::ExtendedOpeningHours: return nil; case MetainfoRows::OpeningHours: return @(m_info.GetOpeningHours().c_str()); case MetainfoRows::Phone: return @(m_info.GetPhone().c_str()); @@ -521,6 +546,8 @@ using namespace place_page; return @(strings::JoinStrings(m_info.GetLocalizedCuisines(), Info::kSubtitleSeparator).c_str()); case MetainfoRows::Operator: return @(m_info.GetOperator().c_str()); case MetainfoRows::Internet: return L(@"WiFi_available"); + case MetainfoRows::LocalAdsCandidate: return L(@"create_campaign_button"); + case MetainfoRows::LocalAdsCustomer: return L(@"view_campaign_button"); case MetainfoRows::Coordinate: return @(m_info .GetFormattedCoordinate( diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm index 4edf4f75c9..17a77c2208 100644 --- a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm +++ b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm @@ -8,6 +8,7 @@ #import "MWMFrameworkListener.h" #import "MWMFrameworkObservers.h" #import "MWMLocationManager.h" +#import "MWMLocationHelpers.h" #import "MWMLocationObserver.h" #import "MWMPlacePageData.h" #import "MWMPlacePageLayout.h" @@ -25,6 +26,9 @@ #include "platform/measurement_utils.hpp" +extern NSString * const kBookmarkDeletedNotification; +extern NSString * const kBookmarkCategoryDeletedNotification; + namespace { void logSponsoredEvent(MWMPlacePageData * data, NSString * eventName) @@ -82,7 +86,16 @@ void logSponsoredEvent(MWMPlacePageData * data, NSString * eventName) } [MWMLocationManager addObserver:self]; - [self.layout setDistanceToObject:self.distanceToObject]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(handleBookmarkDeleting:) + name:kBookmarkDeletedNotification + object:nil]; + + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(handleBookmarkCategoryDeleting:) + name:kBookmarkCategoryDeletedNotification + object:nil]; + [self setupSpeedAndDistance]; [self.layout showWithData:self.data]; @@ -96,6 +109,38 @@ void logSponsoredEvent(MWMPlacePageData * data, NSString * eventName) self.data = nil; [MWMLocationManager removeObserver:self]; [MWMFrameworkListener removeObserver:self]; + [[NSNotificationCenter defaultCenter] removeObserver:self]; +} + +- (void)handleBookmarkDeleting:(NSNotification *)notification +{ + NSAssert(self.data && self.layout, @"It must be openned place page!"); + if (!self.data.isBookmark) + return; + + auto value = static_cast(notification.object); + auto deletedBac = BookmarkAndCategory(); + [value getValue:&deletedBac]; + NSAssert(deletedBac.IsValid(), @"Place page must have valid bookmark and category."); + auto bac = self.data.bac; + if (bac.m_bookmarkIndex != deletedBac.m_bookmarkIndex || bac.m_categoryIndex != deletedBac.m_categoryIndex) + return; + + [self shouldClose]; +} + +- (void)handleBookmarkCategoryDeleting:(NSNotification *)notification +{ + NSAssert(self.data && self.layout, @"It must be openned place page!"); + if (!self.data.isBookmark) + return; + + auto deletedIndex = static_cast(notification.object).integerValue; + auto index = self.data.bac.m_categoryIndex; + if (index != deletedIndex) + return; + + [self shouldClose]; } #pragma mark - MWMPlacePageLayoutDataSource @@ -200,9 +245,16 @@ void logSponsoredEvent(MWMPlacePageData * data, NSString * eventName) [self.layout rotateDirectionArrowToAngle:angle]; } -- (void)onLocationUpdate:(location::GpsInfo const &)locationInfo +- (void)setupSpeedAndDistance { [self.layout setDistanceToObject:self.distanceToObject]; + if (self.data.isMyPosition) + [self.layout setSpeedAndAltitude:location_helpers::formattedSpeedAndAltitude(MWMLocationManager.lastLocation)]; +} + +- (void)onLocationUpdate:(location::GpsInfo const &)locationInfo +{ + [self setupSpeedAndDistance]; } - (void)mwm_refreshUI { [self.layout mwm_refreshUI]; } diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ButtonCell/MWMPlacePageButtonCell.h b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ButtonCell/MWMPlacePageButtonCell.h index 52a94b01b1..1fab5e205f 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ButtonCell/MWMPlacePageButtonCell.h +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ButtonCell/MWMPlacePageButtonCell.h @@ -1,12 +1,17 @@ #import "MWMPlacePageData.h" #import "MWMTableViewCell.h" +#import "MWMTypes.h" @protocol MWMPlacePageButtonsProtocol; @interface MWMPlacePageButtonCell : MWMTableViewCell +- (void)configWithTitle:(NSString *)title + action:(MWMVoidBlock)action + isInsetButton:(BOOL)isInsetButton; + - (void)configForRow:(place_page::ButtonsRows)row - withDelegate:(id)delegate; + withAction:(MWMVoidBlock)action; - (void)setEnabled:(BOOL)enabled; - (BOOL)isEnabled; diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ButtonCell/MWMPlacePageButtonCell.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ButtonCell/MWMPlacePageButtonCell.mm index f535b6e8a6..457f234cf8 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ButtonCell/MWMPlacePageButtonCell.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ButtonCell/MWMPlacePageButtonCell.mm @@ -7,8 +7,8 @@ @property(weak, nonatomic) IBOutlet MWMBorderedButton * titleButton; -@property(weak, nonatomic) id delegate; @property(nonatomic) place_page::ButtonsRows rowType; +@property(copy, nonatomic) MWMVoidBlock action; @property(weak, nonatomic) IBOutlet NSLayoutConstraint * buttonTop; @property(weak, nonatomic) IBOutlet NSLayoutConstraint * buttonTrailing; @@ -31,13 +31,24 @@ - (void)setEnabled:(BOOL)enabled { self.titleButton.enabled = enabled; } - (BOOL)isEnabled { return self.titleButton.isEnabled; } + +- (void)configWithTitle:(NSString *)title + action:(MWMVoidBlock)action + isInsetButton:(BOOL)isInsetButton +{ + self.rowType = place_page::ButtonsRows::Other; + self.action = action; + self.isInsetButton = isInsetButton; + [self.titleButton setTitle:title forState:UIControlStateNormal]; +} + - (void)configForRow:(place_page::ButtonsRows)row - withDelegate:(id)delegate + withAction:(MWMVoidBlock)action { using place_page::ButtonsRows; - self.delegate = delegate; self.rowType = row; + self.action = action; NSString * title = nil; BOOL isInsetButton = NO; switch (row) @@ -56,23 +67,9 @@ break; case ButtonsRows::HotelDescription: title = L(@"details_on_bookingcom"); - break; - case ButtonsRows::BookingShowMoreFacilities: - title = L(@"booking_show_more"); - break; - case ButtonsRows::BookingShowMoreReviews: - title = L(@"reviews_on_bookingcom"); - break; - case ButtonsRows::BookingShowMoreOnSite: - title = L(@"more_on_bookingcom"); - break; - case ButtonsRows::LocalAdsCandidate: - title = L(@"create_campaign_button"); isInsetButton = YES; break; - case ButtonsRows::LocalAdsCustomer: - title = L(@"view_campaign_button"); - isInsetButton = YES; + case ButtonsRows::Other: break; } @@ -82,21 +79,8 @@ - (IBAction)buttonTap { - using place_page::ButtonsRows; - - auto d = self.delegate; - switch (self.rowType) - { - case ButtonsRows::AddPlace: [d addPlace]; break; - case ButtonsRows::EditPlace: [d editPlace]; break; - case ButtonsRows::AddBusiness: [d addBusiness]; break; - case ButtonsRows::BookingShowMoreOnSite: - case ButtonsRows::HotelDescription: [d book:YES]; break; - case ButtonsRows::BookingShowMoreFacilities: [d showAllFacilities]; break; - case ButtonsRows::BookingShowMoreReviews: [d showAllReviews]; break; - case ButtonsRows::LocalAdsCandidate: - case ButtonsRows::LocalAdsCustomer: [d openLocalAdsURL]; break; - } + if (self.action) + self.action(); } #pragma mark - Properties diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageRegularCell.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageRegularCell.mm index 6397da5b26..1f9672bce2 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageRegularCell.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageRegularCell.mm @@ -78,7 +78,8 @@ break; case MetainfoRows::ExtendedOpeningHours: case MetainfoRows::OpeningHours: - case MetainfoRows::Taxi: NSAssert(false, @"Incorrect cell type!"); break; + case MetainfoRows::LocalAdsCandidate: + case MetainfoRows::LocalAdsCustomer: break; } [self configWithIconName:name data:[data stringForRow:row]]; } @@ -130,13 +131,16 @@ - (IBAction)cellTap { using place_page::MetainfoRows; + auto data = self.data; switch (self.rowType) { case MetainfoRows::Phone: [Statistics logEvent:kStatEventName(kStatPlacePage, kStatCallPhoneNumber)]; + [data logLocalAdsEvent:local_ads::EventType::ClickedPhone]; break; case MetainfoRows::Website: [Statistics logEvent:kStatEventName(kStatPlacePage, kStatOpenSite)]; + [data logLocalAdsEvent:local_ads::EventType::ClickedWebsite]; break; case MetainfoRows::Email: [Statistics logEvent:kStatEventName(kStatPlacePage, kStatSendEmail)]; @@ -144,7 +148,7 @@ case MetainfoRows::Coordinate: [Statistics logEvent:kStatEventName(kStatPlacePage, kStatToggleCoordinates)]; [MWMPlacePageData toggleCoordinateSystem]; - [self changeText:[self.data stringForRow:self.rowType]]; + [self changeText:[data stringForRow:self.rowType]]; break; case MetainfoRows::ExtendedOpeningHours: case MetainfoRows::Cuisine: @@ -152,7 +156,8 @@ case MetainfoRows::OpeningHours: case MetainfoRows::Address: case MetainfoRows::Internet: - case MetainfoRows::Taxi: break; + case MetainfoRows::LocalAdsCustomer: + case MetainfoRows::LocalAdsCandidate: break; } } diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.h b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.h index 39e5415424..87d3a3f6f3 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.h +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.h @@ -40,6 +40,7 @@ - (void)rotateDirectionArrowToAngle:(CGFloat)angle; - (void)setDistanceToObject:(NSString *)distance; +- (void)setSpeedAndAltitude:(NSString *)speedAndAltitude; - (void)processDownloaderEventWithStatus:(storage::NodeStatus)status progress:(CGFloat)progress; diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm index ba7ce90984..cb94adf0c2 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm @@ -31,8 +31,7 @@ map const kMetaInfoCells = { {MetainfoRows::Cuisine, [MWMPlacePageInfoCell class]}, {MetainfoRows::Operator, [MWMPlacePageInfoCell class]}, {MetainfoRows::Coordinate, [MWMPlacePageInfoCell class]}, - {MetainfoRows::Internet, [MWMPlacePageInfoCell class]}, - {MetainfoRows::Taxi, [MWMPlacePageTaxiCell class]}}; + {MetainfoRows::Internet, [MWMPlacePageInfoCell class]}}; } // namespace @interface MWMPlacePageLayout () const kMetaInfoCells = { [tv registerWithCellClass:[MWMPPReviewHeaderCell class]]; [tv registerWithCellClass:[MWMPPReviewCell class]]; [tv registerWithCellClass:[MWMPPFacilityCell class]]; + [tv registerWithCellClass:[MWMPlacePageTaxiCell class]]; // Register all meta info cells. for (auto const & pair : kMetaInfoCells) @@ -156,6 +156,11 @@ map const kMetaInfoCells = { [self.previewLayoutHelper setDistanceToObject:distance]; } +- (void)setSpeedAndAltitude:(NSString *)speedAndAltitude +{ + [self.previewLayoutHelper setSpeedAndAltitude:speedAndAltitude]; +} + - (MWMPlacePageActionBar *)actionBar { if (!_actionBar) @@ -311,6 +316,7 @@ map const kMetaInfoCells = { case Sections::Bookmark: return 1; case Sections::Preview: return data.previewRows.size(); case Sections::Metainfo: return data.metainfoRows.size(); + case Sections::Ad: return data.adRows.size(); case Sections::Buttons: return data.buttonsRows.size(); case Sections::HotelPhotos: return data.photosRows.size(); case Sections::HotelDescription: return data.descriptionRows.size(); @@ -368,24 +374,43 @@ map const kMetaInfoCells = { [c configWithRow:row data:data]; return c; } - case MetainfoRows::Taxi: + case MetainfoRows::LocalAdsCustomer: + case MetainfoRows::LocalAdsCandidate: { - Class cls = kMetaInfoCells.at(row); - auto c = static_cast( - [tableView dequeueReusableCellWithCellClass:cls indexPath:indexPath]); - c.delegate = delegate; + Class cls = [MWMPlacePageButtonCell class]; + auto c = static_cast([tableView dequeueReusableCellWithCellClass:cls + indexPath:indexPath]); + [c configWithTitle:[data stringForRow:row] action:^{ [delegate openLocalAdsURL]; } isInsetButton:NO]; return c; } } } + case Sections::Ad: + { + Class cls = [MWMPlacePageTaxiCell class]; + auto c = static_cast( + [tableView dequeueReusableCellWithCellClass:cls indexPath:indexPath]); + c.delegate = delegate; + return c; + } case Sections::Buttons: { Class cls = [MWMPlacePageButtonCell class]; auto c = static_cast( [tableView dequeueReusableCellWithCellClass:cls indexPath:indexPath]); auto const row = data.buttonsRows[indexPath.row]; - [c configForRow:row withDelegate:delegate]; + [c configForRow:row withAction:^{ + switch (row) + { + case ButtonsRows::AddPlace: [delegate addPlace]; break; + case ButtonsRows::EditPlace: [delegate editPlace]; break; + case ButtonsRows::AddBusiness: [delegate addBusiness]; break; + case ButtonsRows::HotelDescription: [delegate book:YES]; break; + case ButtonsRows::Other: NSAssert(false, @"Incorrect row"); + } + }]; + if (row != ButtonsRows::HotelDescription) [c setEnabled:self.isPlacePageButtonsEnabled]; else @@ -415,7 +440,7 @@ map const kMetaInfoCells = { case HotelFacilitiesRow::ShowMore: Class cls = [MWMPlacePageButtonCell class]; auto c = static_cast([tableView dequeueReusableCellWithCellClass:cls indexPath:indexPath]); - [c configForRow:ButtonsRows::BookingShowMoreFacilities withDelegate:delegate]; + [c configWithTitle:L(@"booking_show_more") action:^{ [delegate showAllFacilities]; } isInsetButton:NO]; return c; } } @@ -442,7 +467,8 @@ map const kMetaInfoCells = { { Class cls = [MWMPlacePageButtonCell class]; auto c = static_cast([tableView dequeueReusableCellWithCellClass:cls indexPath:indexPath]); - [c configForRow:ButtonsRows::BookingShowMoreReviews withDelegate:delegate]; + + [c configWithTitle:L(@"reviews_on_bookingcom") action:^{ [delegate showAllReviews]; } isInsetButton:NO]; return c; } } @@ -464,7 +490,7 @@ map const kMetaInfoCells = { { Class cls = [MWMPlacePageButtonCell class]; auto c = static_cast([tableView dequeueReusableCellWithCellClass:cls indexPath:indexPath]); - [c configForRow:ButtonsRows::BookingShowMoreOnSite withDelegate:delegate]; + [c configWithTitle:L(@"more_on_bookingcom") action:^{ [delegate book:YES];; } isInsetButton:NO]; return c; } } diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMiPhonePlacePageLayoutImpl.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMiPhonePlacePageLayoutImpl.mm index 88d4c9797f..df3b416cec 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMiPhonePlacePageLayoutImpl.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMiPhonePlacePageLayoutImpl.mm @@ -95,9 +95,12 @@ CGFloat const kMinOffset = 1; self.actionBar.minY = self.ownerView.height; [self.scrollView setContentOffset:{} animated:YES]; },^{ + id delegate = self.delegate; + // Workaround for preventing a situation when the scroll view destroyed before an animation finished. + [delegate onPlacePageTopBoundChanged:0]; self.actionBar = nil; self.scrollView = nil; - [self.delegate shouldDestroyLayout]; + [delegate shouldDestroyLayout]; }); } diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/MWMPPPreviewLayoutHelper.h b/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/MWMPPPreviewLayoutHelper.h index a653e23473..fc7485e78c 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/MWMPPPreviewLayoutHelper.h +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/MWMPPPreviewLayoutHelper.h @@ -15,6 +15,7 @@ withData:(MWMPlacePageData *)data; - (void)rotateDirectionArrowToAngle:(CGFloat)angle; - (void)setDistanceToObject:(NSString *)distance; +- (void)setSpeedAndAltitude:(NSString *)speedAndAltitude; - (void)insertRowAtTheEnd; - (CGFloat)height; diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/MWMPPPreviewLayoutHelper.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/MWMPPPreviewLayoutHelper.mm index 68a4aa3c12..f3cf0895f3 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/MWMPPPreviewLayoutHelper.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/MWMPPPreviewLayoutHelper.mm @@ -140,12 +140,14 @@ array const kPreviewCells = {{[_MWMPPPTitle class], [_MWMPPPExternalTi @property(nonatomic) CGFloat leading; @property(nonatomic) MWMDirectionView * directionView; @property(copy, nonatomic) NSString * distance; +@property(copy, nonatomic) NSString * speedAndAltitude; @property(weak, nonatomic) UIImageView * compass; @property(nonatomic) NSIndexPath * lastCellIndexPath; @property(nonatomic) BOOL lastCellIsBanner; @property(nonatomic) NSUInteger distanceRow; @property(weak, nonatomic) MWMAdBanner * cachedBannerCell; +@property(weak, nonatomic) _MWMPPPSubtitle * cachedSubtitle; @end @@ -177,7 +179,10 @@ array const kPreviewCells = {{[_MWMPPPTitle class], [_MWMPPPExternalTi self.lastCellIsBanner = NO; self.lastCellIndexPath = [NSIndexPath indexPathForRow:previewRows.size() - 1 inSection:0]; auto it = find(previewRows.begin(), previewRows.end(), PreviewRows::Space); - if (it != previewRows.end()) + + if (data.isMyPosition) + self.distanceRow = 0; + else if (it != previewRows.end()) self.distanceRow = distance(previewRows.begin(), it) - 1; } @@ -198,8 +203,16 @@ array const kPreviewCells = {{[_MWMPPPTitle class], [_MWMPPPExternalTi static_cast<_MWMPPPExternalTitle *>(c).externalTitle.text = data.externalTitle; break; case PreviewRows::Subtitle: - static_cast<_MWMPPPSubtitle *>(c).subtitle.text = data.subtitle; + { + auto subtitleCell = static_cast<_MWMPPPSubtitle *>(c); + if (data.isMyPosition) + subtitleCell.subtitle.text = self.speedAndAltitude; + else + subtitleCell.subtitle.text = data.subtitle; + + self.cachedSubtitle = subtitleCell; break; + } case PreviewRows::Schedule: { auto scheduleCell = static_cast<_MWMPPPSchedule *>(c); @@ -293,6 +306,15 @@ array const kPreviewCells = {{[_MWMPPPTitle class], [_MWMPPPExternalTi self.directionView.distanceLabel.text = distance; } +- (void)setSpeedAndAltitude:(NSString *)speedAndAltitude +{ + if ([speedAndAltitude isEqualToString:_speedAndAltitude] || !self.data.isMyPosition) + return; + + _speedAndAltitude = speedAndAltitude; + self.cachedSubtitle.subtitle.text = speedAndAltitude; +} + - (void)insertRowAtTheEnd { auto const & previewRows = self.data.previewRows; diff --git a/iphone/Maps/UI/Search/Filters/FilterCollectionHolderCell.swift b/iphone/Maps/UI/Search/Filters/FilterCollectionHolderCell.swift index c79026753a..901187baaf 100644 --- a/iphone/Maps/UI/Search/Filters/FilterCollectionHolderCell.swift +++ b/iphone/Maps/UI/Search/Filters/FilterCollectionHolderCell.swift @@ -3,6 +3,18 @@ final class FilterCollectionHolderCell: MWMTableViewCell { @IBOutlet weak var collectionView: UICollectionView! @IBOutlet private weak var collectionViewHeight: NSLayoutConstraint! + private weak var tableView: UITableView? + override var frame: CGRect { + didSet { + guard #available(iOS 10, *) else { + if (frame.size.height < 1 /* minimal correct height */) { + frame.size.height = collectionViewHeight.constant + tableView?.refresh() + } + return + } + } + } private func layout() { collectionView.setNeedsLayout() @@ -10,13 +22,18 @@ final class FilterCollectionHolderCell: MWMTableViewCell { collectionViewHeight.constant = collectionView.contentSize.height } - func config() { + func config(tableView: UITableView?) { layout() collectionView.allowsMultipleSelection = true; isSeparatorHidden = true backgroundColor = UIColor.pressBackground() + + guard #available(iOS 10, *) else { + self.tableView = tableView + return + } } - + override func layoutSubviews() { super.layoutSubviews() layout() diff --git a/iphone/Maps/UI/Search/Filters/MWMSearchFilterPresentationController.mm b/iphone/Maps/UI/Search/Filters/MWMSearchFilterPresentationController.mm index 080b53ab54..a201fc339f 100644 --- a/iphone/Maps/UI/Search/Filters/MWMSearchFilterPresentationController.mm +++ b/iphone/Maps/UI/Search/Filters/MWMSearchFilterPresentationController.mm @@ -1,4 +1,5 @@ #import "MWMSearchFilterPresentationController.h" +#import "MWMCommon.h" #import "MWMSearch.h" namespace @@ -8,14 +9,14 @@ CGFloat const kiPhonePortraitHeightPercentage = 0.7; CGPoint originForParentSize(CGSize size) { if (size.width > size.height) - return {}; + return {0, isIOSVersionLessThan(10) ? statusBarHeight() : 0}; return {0, size.height * (1 - kiPhonePortraitHeightPercentage)}; } CGSize sizeForParentSize(CGSize size) { if (size.width > size.height) - return size; + return {size.width, size.height - (isIOSVersionLessThan(10) ? statusBarHeight() : 0)}; return {size.width, size.height * kiPhonePortraitHeightPercentage}; } } // namespace diff --git a/iphone/Maps/UI/Search/Filters/MWMSearchFilterTransitioning.mm b/iphone/Maps/UI/Search/Filters/MWMSearchFilterTransitioning.mm index 117514fdaa..31473e597a 100644 --- a/iphone/Maps/UI/Search/Filters/MWMSearchFilterTransitioning.mm +++ b/iphone/Maps/UI/Search/Filters/MWMSearchFilterTransitioning.mm @@ -30,9 +30,6 @@ UIView * toView = toVC.view; UIView * containerView = [transitionContext containerView]; - if (self.isPresentation) - [containerView addSubview:toView]; - UIViewController * animatingVC = self.isPresentation ? toVC : fromVC; UIView * animatingView = animatingVC.view; @@ -45,6 +42,9 @@ animatingView.frame = initialFrame; + if (self.isPresentation) + [containerView addSubview:toView]; + [UIView animateWithDuration:[self transitionDuration:transitionContext] delay:0 usingSpringWithDamping:300 diff --git a/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm b/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm index 3e719db9c8..474d5c381b 100644 --- a/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm +++ b/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm @@ -10,6 +10,8 @@ namespace { +static NSString * const kHotelTypePattern = @"search_hotel_filter_%@"; + std::array(ftypes::IsHotelChecker::Type::Count)> const kTypes = {{ ftypes::IsHotelChecker::Type::Hotel, ftypes::IsHotelChecker::Type::Apartment, @@ -143,7 +145,7 @@ void configButton(UIButton * button, NSString * primaryText, NSString * secondar - (void)initialTypeConfig { - [self.type config]; + [self.type configWithTableView:self.tableView]; [self resetTypes]; } @@ -262,7 +264,7 @@ void configButton(UIButton * button, NSString * primaryText, NSString * secondar { case Section::Rating: return L(@"booking_filters_rating"); case Section::PriceCategory: return L(@"booking_filters_price_category"); - case Section::Type: return L(@"type"); + case Section::Type: return L(@"search_hotel_filters_type"); default: return nil; } } @@ -274,7 +276,8 @@ void configButton(UIButton * button, NSString * primaryText, NSString * secondar MWMFilterTypeCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:[MWMFilterTypeCell className] forIndexPath:indexPath]; auto const type = kTypes[indexPath.row]; - cell.tagName.text = @(ftypes::IsHotelChecker::GetHotelTypeTag(type)); + auto str = [NSString stringWithFormat:kHotelTypePattern, @(ftypes::IsHotelChecker::GetHotelTypeTag(type))]; + cell.tagName.text = L(str); cell.selected = find(m_selectedTypes.begin(), m_selectedTypes.end(), type) != m_selectedTypes.end(); return cell; } diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm index c430d6b766..849b5f2b87 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm +++ b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm @@ -89,6 +89,7 @@ return cell; } case MWMSearchItemTypeMopub: + case MWMSearchItemTypeFacebook: { auto cell = static_cast( [tableView dequeueReusableCellWithCellClass:[MWMAdBanner class] indexPath:indexPath]); @@ -126,7 +127,8 @@ [delegate processSearchWithResult:result]; break; } - case MWMSearchItemTypeMopub: break; + case MWMSearchItemTypeMopub: + case MWMSearchItemTypeFacebook: break; case MWMSearchItemTypeSuggestion: { auto const & suggestion = [MWMSearch resultWithContainerIndex:containerIndex]; @@ -142,6 +144,7 @@ - (void)onSearchCompleted { + [self onSearchResultsUpdated]; BOOL const noResults = [MWMSearch resultsCount] == 0; self.tableView.hidden = noResults; [(MWMSearchTableView *)self.view hideNoResultsView:!noResults]; diff --git a/iphone/Maps/UI/Welcome/WhatsNewController.swift b/iphone/Maps/UI/Welcome/WhatsNewController.swift index 3d81f8aa9f..fd05ff11e2 100644 --- a/iphone/Maps/UI/Welcome/WhatsNewController.swift +++ b/iphone/Maps/UI/Welcome/WhatsNewController.swift @@ -8,9 +8,14 @@ final class WhatsNewController: MWMViewController, WelcomeProtocol { // text: "whatsnew_improved_search_text", // buttonTitle: "whats_new_next_button", // buttonAction: #selector(nextPage)), - WelcomeConfig(image: #imageLiteral(resourceName: "wn_img_1"), - title: "whatsnew_more_info_on_hotels_title", - text: "whatsnew_more_info_on_hotels_message", + WelcomeConfig(image: #imageLiteral(resourceName: "img_whatsnew_driving_style"), + title: "whatsnew_driving_style_title", + text: "whatsnew_driving_style_message", + buttonTitle: "whats_new_next_button", + buttonAction: #selector(nextPage)), + WelcomeConfig(image: #imageLiteral(resourceName: "img_whatsnew_transliteration"), + title: "whatsnew_transliteration_title", + text: "whatsnew_transliteration_message", buttonTitle: "done", buttonAction: #selector(close)) ] diff --git a/iphone/Maps/maps.me dbg.entitlements b/iphone/Maps/maps.me dbg.entitlements new file mode 100644 index 0000000000..903def2af5 --- /dev/null +++ b/iphone/Maps/maps.me dbg.entitlements @@ -0,0 +1,8 @@ + + + + + aps-environment + development + + diff --git a/iphone/Maps/xc dbg.entitlements b/iphone/Maps/xc dbg.entitlements new file mode 100644 index 0000000000..903def2af5 --- /dev/null +++ b/iphone/Maps/xc dbg.entitlements @@ -0,0 +1,8 @@ + + + + + aps-environment + development + + diff --git a/local_ads/campaign_serialization.cpp b/local_ads/campaign_serialization.cpp index 5340951b1c..2b43c093eb 100644 --- a/local_ads/campaign_serialization.cpp +++ b/local_ads/campaign_serialization.cpp @@ -11,14 +11,6 @@ namespace { -enum class Version -{ - unknown = -1, - v1 = 0, // March 2017 (Store feature ids and icon ids as varints, - // use one byte for days before expiration.) - latest = v1 -}; - template constexpr bool IsEnumOrIntegral() { @@ -85,7 +77,7 @@ std::vector Deserialize(std::vector const & bytes) ArrayByteSource src(bytes.data()); auto const version = Read(src); static_cast(version); // No version dispatching for now. - auto const chunksNumber = Read(src); + auto const chunksNumber = Read(src); auto const featureIds = ReadData(src, chunksNumber); auto const icons = ReadData(src, chunksNumber); @@ -103,7 +95,7 @@ std::vector Deserialize(std::vector const & bytes) featureIds[i], icons[i], expirations[i], - false /* priorityBit */ + true /* priorityBit */ ); } return campaigns; diff --git a/local_ads/campaign_serialization.hpp b/local_ads/campaign_serialization.hpp index ab30cfcb74..a73b78b6ed 100644 --- a/local_ads/campaign_serialization.hpp +++ b/local_ads/campaign_serialization.hpp @@ -7,6 +7,14 @@ namespace local_ads { +enum class Version +{ + unknown = -1, + v1 = 0, // March 2017 (Store feature ids and icon ids as varints, + // use one byte for days before expiration.) + latest = v1 +}; + std::vector Serialize(std::vector const & campaigns); std::vector Deserialize(std::vector const & bytes); } // namespace local_ads diff --git a/local_ads/local_ads_tests/campaign_serialization_test.cpp b/local_ads/local_ads_tests/campaign_serialization_test.cpp index a2088f2f1d..5479fa5021 100644 --- a/local_ads/local_ads_tests/campaign_serialization_test.cpp +++ b/local_ads/local_ads_tests/campaign_serialization_test.cpp @@ -29,7 +29,7 @@ std::vector GenerateRandomCampaigns(size_t number) auto const fid = featureIds(gen); auto const iconid = icons(gen); auto const days = expirationDays(gen); - cs.emplace_back(fid, iconid, days, false /* priorityBit */); + cs.emplace_back(fid, iconid, days, true /* priorityBit */); } return cs; } @@ -38,9 +38,9 @@ std::vector GenerateRandomCampaigns(size_t number) UNIT_TEST(Serialization_Smoke) { TEST(TestSerialization({ - {10, 10, 10, 0}, - {1000, 100, 20, 0}, - {120003, 456, 15, 0} + {10, 10, 10, true}, + {1000, 100, 20, true}, + {120003, 456, 15, true} }), ()); TEST(TestSerialization(GenerateRandomCampaigns(100)), ()); diff --git a/local_ads/statistics.cpp b/local_ads/statistics.cpp index 95ffc1e8f6..b018bdac2d 100644 --- a/local_ads/statistics.cpp +++ b/local_ads/statistics.cpp @@ -426,8 +426,8 @@ void Statistics::SendToServer() } else { - LOG(LWARNING, - ("Sending statistics failed:", request.ErrorCode(), it->first.first, it->first.second)); + LOG(LWARNING, ("Sending statistics failed:", "URL:", url, "Error code:", request.ErrorCode(), + it->first.first, it->first.second)); ++it; } } diff --git a/map/framework.cpp b/map/framework.cpp index fbb7455a62..969cd06b19 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -63,6 +63,7 @@ #include "platform/local_country_file_utils.hpp" #include "platform/measurement_utils.hpp" +#include "platform/mwm_traits.hpp" #include "platform/mwm_version.hpp" #include "platform/network_policy.hpp" #include "platform/platform.hpp" @@ -146,7 +147,9 @@ size_t constexpr kMaxTrafficCacheSizeBytes = 64 /* Mb */ * 1024 * 1024; vector kSearchMarks = { "search-result", - "search-booking" + "search-booking", + "search-tinkoff", + "search-adv", }; // TODO! @@ -339,7 +342,8 @@ void Framework::StopLocationFollow() bool Framework::IsEnoughSpaceForMigrate() const { - return GetPlatform().GetWritableStorageStatus(kMaxMwmSizeBytes) == Platform::TStorageStatus::STORAGE_OK; + return GetPlatform().GetWritableStorageStatus(GetStorage().GetMaxMwmSizeBytes()) == + Platform::TStorageStatus::STORAGE_OK; } TCountryId Framework::PreMigrate(ms::LatLon const & position, @@ -447,9 +451,6 @@ Framework::Framework(FrameworkParams const & params) m_model.SetOnMapDeregisteredCallback(bind(&Framework::OnMapDeregistered, this, _1)); LOG(LDEBUG, ("Classificator initialized")); - if (!params.m_disableLocalAds) - m_localAdsManager.Startup(); - m_displayedCategories = make_unique(GetDefaultCategories()); // To avoid possible races - init country info getter once in constructor. @@ -470,6 +471,10 @@ Framework::Framework(FrameworkParams const & params) m_storage.SetDownloadingPolicy(&m_storageDownloadingPolicy); LOG(LDEBUG, ("Storage initialized")); + // Local ads manager should be initialized after storage initialization. + if (!params.m_disableLocalAds) + m_localAdsManager.Startup(); + auto const routingStatisticsFn = [](map const & statistics) { alohalytics::LogEvent("Routing_CalculatingRoute", statistics); @@ -1550,10 +1555,12 @@ bool Framework::Search(search::SearchParams const & params) CancelQuery(intent.m_handle); { - m2::PointD const defaultMarkSize = GetSearchMarkSize(SearchMarkType::DefaultSearchMark); - m2::PointD const bookingMarkSize = GetSearchMarkSize(SearchMarkType::BookingSearchMark); - double const eps = - max(max(defaultMarkSize.x, defaultMarkSize.y), max(bookingMarkSize.x, bookingMarkSize.y)); + double eps = 0.0; + for (size_t i = 0; i < SearchMarkType::SearchMarkTypesCount; i++) + { + m2::PointD const markSize = GetSearchMarkSize(static_cast(i)); + eps = max(eps, max(markSize.x, markSize.y)); + } intent.m_params.m_minDistanceOnMapBetweenResults = eps; } @@ -1747,6 +1754,10 @@ void Framework::FillSearchResultsMarks(search::Results::ConstIter begin, if (r.m_metadata.m_isSponsoredHotel) mark->SetCustomSymbol("search-booking"); + else if (r.m_metadata.m_isSponsoredBank) + mark->SetCustomSymbol("search-tinkoff"); + else if (m_localAdsManager.Contains(r.GetFeatureID())) + mark->SetCustomSymbol("search-adv"); } } @@ -2675,9 +2686,13 @@ void Framework::SetRouterImpl(RouterType type) } else { - auto localFileChecker = [this](string const & countryFile) -> bool - { - return m_model.GetIndex().GetMwmIdByCountryFile(CountryFile(countryFile)).IsAlive(); + auto localFileChecker = [this](string const & countryFile) -> bool { + MwmSet::MwmId const mwmId = + m_model.GetIndex().GetMwmIdByCountryFile(CountryFile(countryFile)); + if (!mwmId.IsAlive()) + return false; + + return version::MwmTraits(mwmId.GetInfo()->m_version).HasRoutingIndex(); }; auto numMwmIds = make_shared(); @@ -2854,49 +2869,28 @@ void Framework::OnRebuildRouteReady(Route const & route, IRouter::ResultCode cod CallRouteBuilded(code, storage::TCountriesVec()); } -RouterType Framework::GetBestRouter(m2::PointD const & startPoint, m2::PointD const & finalPoint) +RouterType Framework::GetBestRouter(m2::PointD const & startPoint, m2::PointD const & finalPoint) const { - if (MercatorBounds::DistanceOnEarth(startPoint, finalPoint) < kKeepPedestrianDistanceMeters) - { - auto const lastUsedRouter = GetLastUsedRouter(); - switch (lastUsedRouter) - { - case RouterType::Pedestrian: - case RouterType::Bicycle: - return lastUsedRouter; - case RouterType::Taxi: - ASSERT(false, ("GetLastUsedRouter should not return RouterType::Taxi")); - case RouterType::Vehicle: - break; - case RouterType::Count: - CHECK(false, ("Bad router type", lastUsedRouter)); - } - - // Return on a short distance the vehicle router flag only if we are already have routing files. - auto countryFileGetter = [this](m2::PointD const & pt) - { - return m_infoGetter->GetRegionCountryId(pt); - }; - if (!CarRouter::CheckRoutingAbility(startPoint, finalPoint, countryFileGetter, - m_model.GetIndex())) - { - return RouterType::Pedestrian; - } - } - return RouterType::Vehicle; + // todo Implement something more sophisticated here (or delete the method). + return GetLastUsedRouter(); } RouterType Framework::GetLastUsedRouter() const { - string routerType; - if (!settings::Get(kRouterTypeKey, routerType)) + string routerTypeStr; + if (!settings::Get(kRouterTypeKey, routerTypeStr)) return RouterType::Vehicle; - if (routerType == routing::ToString(RouterType::Pedestrian)) - return RouterType::Pedestrian; - if (routerType == routing::ToString(RouterType::Bicycle)) - return RouterType::Bicycle; - return RouterType::Vehicle; + auto const routerType = routing::FromString(routerTypeStr); + + switch (routerType) + { + case RouterType::Pedestrian: + case RouterType::Bicycle: + return routerType; + default: + return RouterType::Vehicle; + } } void Framework::SetLastUsedRouter(RouterType type) @@ -3448,7 +3442,8 @@ osm::Editor::SaveResult Framework::SaveEditedMapObject(osm::EditableMapObject em if (shouldNotify) { // TODO @mgsergio fill with correct NoteProblemType - editor.CreateNote(issueLatLon, emo.GetID(), osm::Editor::NoteProblemType::General, + editor.CreateNote(emo.GetLatLon(), emo.GetID(), emo.GetTypes(), emo.GetDefaultName(), + osm::Editor::NoteProblemType::General, "The address on this POI is different from the building address." " It is either a user's mistake, or an issue in the data. Please" " check this and fix if needed. (This note was created automatically" @@ -3489,10 +3484,11 @@ bool Framework::RollBackChanges(FeatureID const & fid) return rolledBack; } -void Framework::CreateNote(ms::LatLon const & latLon, FeatureID const & fid, +void Framework::CreateNote(osm::MapObject const & mapObject, osm::Editor::NoteProblemType const type, string const & note) { - osm::Editor::Instance().CreateNote(latLon, fid, type, note); + osm::Editor::Instance().CreateNote(mapObject.GetLatLon(), mapObject.GetID(), mapObject.GetTypes(), + mapObject.GetDefaultName(), type, note); if (type == osm::Editor::NoteProblemType::PlaceDoesNotExist) DeactivateMapSelection(true /* notifyUI */); } diff --git a/map/framework.hpp b/map/framework.hpp index 5fd6cf0623..6e61f9a794 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -779,10 +779,10 @@ public: void CloseRouting(); void GetRouteFollowingInfo(location::FollowingInfo & info) const { m_routingSession.GetRouteFollowingInfo(info); } m2::PointD GetRouteEndPoint() const { return m_routingSession.GetEndPoint(); } + /// Returns the most situable router engine type. + routing::RouterType GetBestRouter(m2::PointD const & startPoint, m2::PointD const & finalPoint) const; routing::RouterType GetLastUsedRouter() const; void SetLastUsedRouter(routing::RouterType type); - /// Returns the most situable router engine type. Bases on distance and the last used router. - routing::RouterType GetBestRouter(m2::PointD const & startPoint, m2::PointD const & finalPoint); // Sound notifications for turn instructions. inline void EnableTurnNotifications(bool enable) { m_routingSession.EnableTurnNotifications(enable); } inline bool AreTurnNotificationsEnabled() const { return m_routingSession.AreTurnNotificationsEnabled(); } @@ -870,8 +870,8 @@ public: void DeleteFeature(FeatureID const & fid) const; osm::NewFeatureCategories GetEditorCategories() const; bool RollBackChanges(FeatureID const & fid); - void CreateNote(ms::LatLon const & latLon, FeatureID const & fid, - osm::Editor::NoteProblemType const type, string const & note); + void CreateNote(osm::MapObject const & mapObject, osm::Editor::NoteProblemType const type, + string const & note); //@} diff --git a/map/local_ads_manager.cpp b/map/local_ads_manager.cpp index 70402d07ac..acd5526c83 100644 --- a/map/local_ads_manager.cpp +++ b/map/local_ads_manager.cpp @@ -12,7 +12,9 @@ #include "indexer/scales.hpp" #include "platform/http_client.hpp" +#include "platform/marketing_service.hpp" #include "platform/platform.hpp" +#include "platform/settings.hpp" #include "coding/file_name_utils.hpp" #include "coding/url_encode.hpp" @@ -22,6 +24,7 @@ #include "private.h" +#include #include #include @@ -31,12 +34,17 @@ namespace { +std::array const kMarketingParameters = {marketing::kFrom, marketing::kType, marketing::kName, + marketing::kContent, marketing::kKeyword}; std::string const kServerUrl = LOCAL_ADS_SERVER_URL; std::string const kCampaignPageUrl = LOCAL_ADS_COMPANY_PAGE_URL; std::string const kCampaignFile = "local_ads_campaigns.dat"; std::string const kLocalAdsSymbolsFile = "local_ads_symbols.txt"; auto constexpr kWWanUpdateTimeout = std::chrono::hours(12); +uint8_t constexpr kRequestMinZoomLevel = 12; +auto constexpr kFailedDownloadingTimeout = std::chrono::seconds(2); +auto constexpr kMaxDownloadingAttempts = 5; void SerializeCampaign(FileWriter & writer, std::string const & countryName, LocalAdsManager::Timestamp const & ts, @@ -71,25 +79,14 @@ std::string MakeCampaignDownloadingURL(MwmSet::MwmId const & mwmId) return {}; std::ostringstream ss; - ss << kServerUrl << "/" << mwmId.GetInfo()->GetVersion() << "/" + auto const campaignDataVersion = static_cast(local_ads::Version::latest); + ss << kServerUrl << "/" + << campaignDataVersion << "/" + << mwmId.GetInfo()->GetVersion() << "/" << UrlEncode(mwmId.GetInfo()->GetCountryName()) << ".ads"; return ss.str(); } -std::vector DownloadCampaign(MwmSet::MwmId const & mwmId) -{ - std::string const url = MakeCampaignDownloadingURL(mwmId); - if (url.empty()) - return {}; - - platform::HttpClient request(url); - if (!request.RunHttpRequest() || request.ErrorCode() != 200) - return {}; - - string const & response = request.ServerResponse(); - return std::vector(response.cbegin(), response.cend()); -} - df::CustomSymbols ParseCampaign(std::vector const & rawData, MwmSet::MwmId const & mwmId, LocalAdsManager::Timestamp timestamp) { @@ -154,6 +151,26 @@ std::string MakeCampaignPageURL(FeatureID const & featureId) std::ostringstream ss; ss << kCampaignPageUrl << "/" << featureId.m_mwmId.GetInfo()->GetVersion() << "/" << UrlEncode(featureId.m_mwmId.GetInfo()->GetCountryName()) << "/" << featureId.m_index; + + bool isFirstParam = true; + for (auto const & key : kMarketingParameters) + { + string value; + if (!marketing::Settings::Get(key, value)) + continue; + + if (isFirstParam) + { + ss << "?"; + isFirstParam = false; + } + else + { + ss << "&"; + } + ss << key << "=" << value; + } + return ss.str(); } } // namespace @@ -225,7 +242,7 @@ void LocalAdsManager::UpdateViewport(ScreenBase const & screen) { auto connectionStatus = GetPlatform().ConnectionStatus(); if (kServerUrl.empty() || connectionStatus == Platform::EConnectionType::CONNECTION_NONE || - df::GetZoomLevel(screen.GetScale()) <= scales::GetUpperWorldScale()) + df::GetZoomLevel(screen.GetScale()) < kRequestMinZoomLevel) { return; } @@ -246,6 +263,18 @@ void LocalAdsManager::UpdateViewport(ScreenBase const & screen) auto info = mwm.GetInfo(); if (!info) continue; + + // Skip downloading request if maximum attempts count has reached or + // we are waiting for new attempt. + auto const failedDownloadsIt = m_failedDownloads.find(mwm); + if (failedDownloadsIt != m_failedDownloads.cend() && + (failedDownloadsIt->second.m_attemptsCount >= kMaxDownloadingAttempts || + Now() <= failedDownloadsIt->second.m_lastDownloading + + failedDownloadsIt->second.m_currentTimeout)) + { + continue; + } + std::string const & mwmName = info->GetCountryName(); auto campaignIt = m_campaigns.find(mwmName); if (campaignIt == m_campaigns.end()) @@ -276,6 +305,52 @@ void LocalAdsManager::UpdateViewport(ScreenBase const & screen) } } +bool LocalAdsManager::DownloadCampaign(MwmSet::MwmId const & mwmId, std::vector & bytes) +{ + bytes.clear(); + + std::string const url = MakeCampaignDownloadingURL(mwmId); + if (url.empty()) + return true; // In this case empty result is valid. + + // Skip already downloaded campaigns. We do not lock whole method because RunHttpRequest + // is a synchronous method and may take a lot of time. The case in which countryName will + // be added to m_campaigns between locks is neglected. + { + std::lock_guard lock(m_mutex); + auto const & countryName = mwmId.GetInfo()->GetCountryName(); + auto const it = m_campaigns.find(countryName); + if (it != m_campaigns.cend() && it->second) + return false; + } + + platform::HttpClient request(url); + bool const success = request.RunHttpRequest() && request.ErrorCode() == 200; + + std::lock_guard lock(m_mutex); + if (!success) + { + auto const it = m_failedDownloads.find(mwmId); + if (it == m_failedDownloads.cend()) + { + m_failedDownloads.insert(std::make_pair( + mwmId, BackoffStats(Now(), kFailedDownloadingTimeout, 1 /* m_attemptsCount */))); + } + else + { + // Here we increase timeout multiplying by 2. + it->second.m_currentTimeout = std::chrono::seconds(it->second.m_currentTimeout.count() * 2); + it->second.m_attemptsCount++; + } + return false; + } + + m_failedDownloads.erase(mwmId); + auto const & response = request.ServerResponse(); + bytes.assign(response.cbegin(), response.cend()); + return true; +} + void LocalAdsManager::ThreadRoutine() { local_ads::IconsInfo::Instance().SetSourceFile(kLocalAdsSymbolsFile); @@ -299,25 +374,28 @@ void LocalAdsManager::ThreadRoutine() { // Download campaign data from server. CampaignInfo info; - info.m_data = DownloadCampaign(mwm.first); - if (info.m_data.empty()) + if (!DownloadCampaign(mwm.first, info.m_data)) continue; - info.m_created = Now(); - // Parse data and send symbols to rendering. - auto symbols = ParseCampaign(std::move(info.m_data), mwm.first, info.m_created); - if (symbols.empty()) + // Parse data and send symbols to rendering (or delete from rendering). + if (!info.m_data.empty()) { - std::lock_guard lock(m_mutex); - m_campaigns.erase(countryName); - m_info.erase(countryName); - DeleteSymbolsFromRendering(mwm.first); + auto symbols = ParseCampaign(std::move(info.m_data), mwm.first, info.m_created); + if (symbols.empty()) + { + DeleteSymbolsFromRendering(mwm.first); + } + else + { + UpdateFeaturesCache(symbols); + SendSymbolsToRendering(std::move(symbols)); + } } else { - UpdateFeaturesCache(symbols); - SendSymbolsToRendering(std::move(symbols)); + DeleteSymbolsFromRendering(mwm.first); } + info.m_created = Now(); // Update run-time data. { diff --git a/map/local_ads_manager.hpp b/map/local_ads_manager.hpp index 0740fbd2f6..4571d4da7a 100644 --- a/map/local_ads_manager.hpp +++ b/map/local_ads_manager.hpp @@ -82,6 +82,10 @@ private: void FillSupportedTypes(); + // Returned value means if downloading process finished correctly or was interrupted + // by some reason. + bool DownloadCampaign(MwmSet::MwmId const & mwmId, std::vector & bytes); + GetMwmsByRectFn m_getMwmsByRectFn; GetMwmIdByName m_getMwmIdByNameFn; @@ -98,16 +102,32 @@ private: df::CustomSymbols m_symbolsCache; std::mutex m_symbolsCacheMutex; + std::set m_featuresCache; + mutable std::mutex m_featuresCacheMutex; + + ftypes::HashSetMatcher m_supportedTypes; + + struct BackoffStats + { + BackoffStats() = default; + BackoffStats(Timestamp lastDownloading, std::chrono::seconds currentTimeout, + uint8_t attemptsCount) + : m_lastDownloading(lastDownloading) + , m_currentTimeout(currentTimeout) + , m_attemptsCount(attemptsCount) + {} + + Timestamp m_lastDownloading = {}; + std::chrono::seconds m_currentTimeout = std::chrono::seconds(0); + uint8_t m_attemptsCount = 0; + }; + std::map m_failedDownloads; + + local_ads::Statistics m_statistics; + bool m_isRunning = false; std::condition_variable m_condition; std::set m_requestedCampaigns; std::mutex m_mutex; threads::SimpleThread m_thread; - - local_ads::Statistics m_statistics; - - std::set m_featuresCache; - mutable std::mutex m_featuresCacheMutex; - - ftypes::HashSetMatcher m_supportedTypes; }; diff --git a/map/local_ads_supported_types.cpp b/map/local_ads_supported_types.cpp index 18eb30e1df..94e40b3db3 100644 --- a/map/local_ads_supported_types.cpp +++ b/map/local_ads_supported_types.cpp @@ -55,100 +55,25 @@ void LocalAdsManager::FillSupportedTypes() {"amenity", "veterinary"}, {"amenity", "waste_disposal"}, - {"craft", "brewery"}, - {"craft", "carpenter"}, - {"craft", "electrician"}, - {"craft", "gardener"}, - {"craft", "hvac"}, - {"craft", "metal_construction"}, - {"craft", "painter"}, - {"craft", "photographer"}, - {"craft", "plumber"}, - {"craft", "shoemaker"}, - {"craft", "tailor"}, + {"craft"}, {"historic", "castle"}, {"historic", "museum"}, {"historic", "ship"}, - {"office", "company"}, - {"office", "estate_agent"}, - {"office", "government"}, - {"office", "lawyer"}, - {"office", "telecommunication"}, + {"leisure", "fitness_centre"}, + {"leisure", "sauna"}, + {"leisure", "sports_centre"}, - {"shop", "alcohol"}, - {"shop", "bakery"}, - {"shop", "beauty"}, - {"shop", "beverages"}, - {"shop", "bicycle"}, - {"shop", "bookmaker"}, - {"shop", "books"}, - {"shop", "butcher"}, - {"shop", "car"}, - {"shop", "car_parts"}, - {"shop", "car_repair"}, - {"shop", "chemist"}, - {"shop", "clothes"}, - {"shop", "computer"}, - {"shop", "confectionery"}, - {"shop", "convenience"}, - {"shop", "copyshop"}, - {"shop", "cosmetics"}, - {"shop", "department_store"}, - {"shop", "doityourself"}, - {"shop", "dry_cleaning"}, - {"shop", "electronics"}, - {"shop", "florist"}, - {"shop", "furniture"}, - {"shop", "garden_centre"}, - {"shop", "gift"}, - {"shop", "greengrocer"}, - {"shop", "hairdresser"}, - {"shop", "hardware"}, - {"shop", "jewelry"}, - {"shop", "kiosk"}, - {"shop", "laundry"}, - {"shop", "mall"}, - {"shop", "mobile_phone"}, - {"shop", "optician"}, - {"shop", "outdoor"}, - {"shop", "pet"}, - {"shop", "photo"}, - {"shop", "seafood"}, - {"shop", "shoes"}, - {"shop", "sports"}, - {"shop", "supermarket"}, - {"shop", "ticket"}, - {"shop", "toys"}, - {"shop", "travel_agency"}, - {"shop", "tyres"}, - {"shop", "wine"}, + {"man_made", "lighthouse"}, + + {"office"}, + + {"shop"}, {"sponsored", "booking"}, - {"sport", "american_football"}, - {"sport", "archery"}, - {"sport", "athletics"}, - {"sport", "australian_football"}, - {"sport", "baseball"}, - {"sport", "basketball"}, - {"sport", "bowls"}, - {"sport", "cricket"}, - {"sport", "curling"}, - {"sport", "diving"}, - {"sport", "equestrian"}, - {"sport", "football"}, - {"sport", "golf"}, - {"sport", "gymnastics"}, - {"sport", "handball"}, - {"sport", "multi"}, - {"sport", "scuba_diving"}, - {"sport", "shooting"}, - {"sport", "skiing"}, - {"sport", "soccer"}, - {"sport", "swimming"}, - {"sport", "tennis"}, + {"sport"}, {"tourism", "alpine_hut"}, {"tourism", "apartment"}, @@ -157,6 +82,7 @@ void LocalAdsManager::FillSupportedTypes() {"tourism", "camp_site"}, {"tourism", "caravan_site"}, {"tourism", "chalet"}, + {"tourism", "gallery"}, {"tourism", "guest_house"}, {"tourism", "hostel"}, {"tourism", "hotel"}, diff --git a/map/map_tests/mwm_url_tests.cpp b/map/map_tests/mwm_url_tests.cpp index 2bbf03fec8..3a5600e202 100644 --- a/map/map_tests/mwm_url_tests.cpp +++ b/map/map_tests/mwm_url_tests.cpp @@ -5,6 +5,8 @@ #include "drape_frontend/visual_params.hpp" +#include "platform/settings.hpp" + #include "coding/uri.hpp" #include "base/string_format.hpp" @@ -156,6 +158,37 @@ UNIT_TEST(SearchApiInvalidUrl) TEST(!IsValid(f, "mapsme://search?Query=fff"), ("The parser is case sensitive")); } +UNIT_TEST(LeadApiSmoke) +{ + string const uriString = "mapsme://lead?utm_source=a&utm_medium=b&utm_campaign=c&utm_content=d&utm_term=e"; + TEST(Uri(uriString).IsValid(), ()); + ApiTest test(uriString); + TEST(test.IsValid(), ()); + + auto checkEqual = [](string const & key, string const & value) + { + string result; + TEST(marketing::Settings::Get(key, result), ()); + TEST_EQUAL(result, value, ()); + }; + + checkEqual("utm_source", "a"); + checkEqual("utm_medium", "b"); + checkEqual("utm_campaign", "c"); + checkEqual("utm_content", "d"); + checkEqual("utm_term", "e"); +} + +UNIT_TEST(LeadApiInvalid) +{ + Framework f; + TEST(!IsValid(f, "mapsme://lead?"), ("From, type and name parameters are necessary")); + TEST(!IsValid(f, "mapsme://lead?utm_source&utm_medium&utm_campaign"), ("Parameters can't be empty")); + TEST(IsValid(f, "mapsme://lead?utm_source=a&utm_medium=b&utm_campaign=c"), ("These parameters are enough")); + TEST(IsValid(f, "mapsme://lead?utm_source=a&utm_medium=b&utm_campaign=c&smh=smh"), ("If there is an excess parameter just ignore it")); + TEST(!IsValid(f, "mapsme://lead?utm_source=a&UTM_MEDIUM=b&utm_campaign=c&smh=smh"), ("The parser is case sensitive")); +} + UNIT_TEST(MapApiInvalidUrl) { Framework fm; diff --git a/map/mwm_url.cpp b/map/mwm_url.cpp index c7d829e9b4..23a5d830a5 100644 --- a/map/mwm_url.cpp +++ b/map/mwm_url.cpp @@ -8,6 +8,9 @@ #include "drape_frontend/visual_params.hpp" +#include "platform/marketing_service.hpp" +#include "platform/settings.hpp" + #include "coding/uri.hpp" #include "base/logging.hpp" @@ -20,36 +23,87 @@ namespace url_scheme { +namespace lead +{ +char const * kFrom = marketing::kFrom; +char const * kType = marketing::kType; +char const * kName = marketing::kName; +char const * kContent = marketing::kContent; +char const * kKeyword = marketing::kKeyword; + +struct CampaignDescription +{ + void Write() const + { + if (!IsValid()) + { + LOG(LERROR, ("Invalid campaign description")); + return; + } + + marketing::Settings::Set(kFrom, m_from); + marketing::Settings::Set(kType, m_type); + marketing::Settings::Set(kName, m_name); + + if (!m_content.empty()) + marketing::Settings::Set(kContent, m_content); + + if (!m_keyword.empty()) + marketing::Settings::Set(kKeyword, m_keyword); + } + + bool IsValid() const { return !m_from.empty() && !m_type.empty() && !m_name.empty(); } + + string m_from; + string m_type; + string m_name; + string m_content; + string m_keyword; +}; +} // namespace lead + +namespace map +{ +char const * kLatLon = "ll"; +char const * kZoomLevel = "z"; +char const * kName = "n"; +char const * kId = "id"; +char const * kStyle = "s"; +char const * kBackUrl = "backurl"; +char const * kVersion = "v"; +char const * kAppName = "appname"; +char const * kBalloonAction = "balloonaction"; +} // namespace map + +namespace route +{ +char const * kSourceLatLon = "sll"; +char const * kDestLatLon = "dll"; +char const * kSourceName = "saddr"; +char const * kDestName = "daddr"; +char const * kRouteType = "type"; +char const * kRouteTypeVehicle = "vehicle"; +char const * kRouteTypePedestrian = "pedestrian"; +char const * kRouteTypeBicycle = "bicycle"; +} // namespace route + +namespace search +{ +char const * kQuery = "query"; +char const * kCenterLatLon = "cll"; +char const * kLocale = "locale"; +char const * kSearchOnMap = "map"; +} // namespace search + namespace { -string const kLatLon = "ll"; -string const kQuery = "query"; -string const kCenterLatLon = "cll"; -string const kLocale = "locale"; -string const kSearchOnMap = "map"; -string const kSourceLatLon = "sll"; -string const kDestLatLon = "dll"; -string const kZoomLevel = "z"; -string const kName = "n"; -string const kSourceName = "saddr"; -string const kDestName = "daddr"; -string const kId = "id"; -string const kStyle = "s"; -string const kBackUrl = "backurl"; -string const kVersion = "v"; -string const kAppName = "appname"; -string const kBalloonAction = "balloonaction"; -string const kRouteType = "type"; -string const kRouteTypeVehicle = "vehicle"; -string const kRouteTypePedestrian = "pedestrian"; -string const kRouteTypeBicycle = "bicycle"; - enum class ApiURLType { Incorrect, Map, Route, - Search + Search, + Lead }; std::array const kAvailableSchemes = {{"mapswithme", "mwm", "mapsme"}}; @@ -66,6 +120,8 @@ ApiURLType URLType(Uri const & uri) return ApiURLType::Route; if (path == "search") return ApiURLType::Search; + if (path == "lead") + return ApiURLType::Lead; return ApiURLType::Incorrect; } @@ -125,7 +181,11 @@ ParsedMapApi::ParsingResult ParsedMapApi::Parse(Uri const & uri) case ApiURLType::Map: { vector points; - if (!uri.ForEachKeyValue(bind(&ParsedMapApi::AddKeyValue, this, _1, _2, ref(points)))) + auto const result = uri.ForEachKeyValue([&points, this](string const & key, string const & value) + { + return AddKeyValue(key, value, points); + }); + if (!result) return ParsingResult::Incorrect; if (points.empty()) @@ -147,8 +207,14 @@ ParsedMapApi::ParsingResult ParsedMapApi::Parse(Uri const & uri) case ApiURLType::Route: { m_routePoints.clear(); + using namespace route; vector pattern{kSourceLatLon, kSourceName, kDestLatLon, kDestName, kRouteType}; - if (!uri.ForEachKeyValue(bind(&ParsedMapApi::RouteKeyValue, this, _1, _2, ref(pattern)))) + auto const result = uri.ForEachKeyValue([&pattern, this](string const & key, string const & value) + { + return RouteKeyValue(key, value, pattern); + }); + + if (!result) return ParsingResult::Incorrect; if (pattern.size() != 0) @@ -163,17 +229,41 @@ ParsedMapApi::ParsingResult ParsedMapApi::Parse(Uri const & uri) return ParsingResult::Route; } case ApiURLType::Search: + { SearchRequest request; - if (!uri.ForEachKeyValue(bind(&ParsedMapApi::SearchKeyValue, this, _1, _2, ref(request)))) + auto const result = uri.ForEachKeyValue([&request, this](string const & key, string const & value) + { + return SearchKeyValue(key, value, request); + }); + if (!result) return ParsingResult::Incorrect; m_request = request; return request.m_query.empty() ? ParsingResult::Incorrect : ParsingResult::Search; + } + case ApiURLType::Lead: + { + lead::CampaignDescription description; + auto result = uri.ForEachKeyValue([&description, this](string const & key, string const & value) + { + return LeadKeyValue(key, value, description); + }); + if (!result) + return ParsingResult::Incorrect; + + if (!description.IsValid()) + return ParsingResult::Incorrect; + + description.Write(); + return ParsingResult::Lead; + } } } bool ParsedMapApi::RouteKeyValue(string const & key, string const & value, vector & pattern) { + using namespace route; + if (pattern.empty() || key != pattern.front()) return false; @@ -212,6 +302,8 @@ bool ParsedMapApi::RouteKeyValue(string const & key, string const & value, vecto bool ParsedMapApi::AddKeyValue(string const & key, string const & value, vector & points) { + using namespace map; + if (key == kLatLon) { double lat = 0.0; @@ -289,6 +381,8 @@ bool ParsedMapApi::AddKeyValue(string const & key, string const & value, vector< bool ParsedMapApi::SearchKeyValue(string const & key, string const & value, SearchRequest & request) const { + using namespace search; + if (key == kQuery) { if (value.empty()) @@ -318,6 +412,26 @@ bool ParsedMapApi::SearchKeyValue(string const & key, string const & value, Sear return true; } +bool ParsedMapApi::LeadKeyValue(string const & key, string const & value, lead::CampaignDescription & description) const +{ + using namespace lead; + + if (key == kFrom) + description.m_from = value; + else if (key == kType) + description.m_type = value; + else if (key == kName) + description.m_name = value; + else if (key == kContent) + description.m_content = value; + else if (key == kKeyword) + description.m_keyword = value; + /* + We have to support parsing the uri which contains unregistred parameters. + */ + return true; +} + void ParsedMapApi::Reset() { m_globalBackUrl.clear(); diff --git a/map/mwm_url.hpp b/map/mwm_url.hpp index 4d3fac63ed..a656988306 100644 --- a/map/mwm_url.hpp +++ b/map/mwm_url.hpp @@ -37,6 +37,12 @@ struct SearchRequest bool m_isSearchOnMap = false; }; + +namespace lead +{ +struct CampaignDescription; +} + class Uri; /// Handles [mapswithme|mwm|mapsme]://map|route|search?params - everything related to displaying info on a map @@ -48,7 +54,8 @@ public: Incorrect, Map, Route, - Search + Search, + Lead }; ParsedMapApi() = default; @@ -74,6 +81,7 @@ private: bool AddKeyValue(string const & key, string const & value, vector & points); bool RouteKeyValue(string const & key, string const & value, vector & pattern); bool SearchKeyValue(string const & key, string const & value, SearchRequest & request) const; + bool LeadKeyValue(string const & key, string const & value, lead::CampaignDescription & description) const; BookmarkManager * m_bmManager = nullptr; vector m_routePoints; diff --git a/map/place_page_info.cpp b/map/place_page_info.cpp index 26d0a20449..4eb6ec48c1 100644 --- a/map/place_page_info.cpp +++ b/map/place_page_info.cpp @@ -180,7 +180,9 @@ string Info::GetApproximatePricing() const return string(); int pricing; - strings::to_int(GetMetadata().Get(feature::Metadata::FMD_PRICE_RATE), pricing); + if (!strings::to_int(GetMetadata().Get(feature::Metadata::FMD_PRICE_RATE), pricing)) + return string(); + string result; for (auto i = 0; i < pricing; i++) result.append(kPricingSymbol); diff --git a/map/user_mark.hpp b/map/user_mark.hpp index 2af93c802c..d205fa7689 100644 --- a/map/user_mark.hpp +++ b/map/user_mark.hpp @@ -54,6 +54,8 @@ enum SearchMarkType { DefaultSearchMark = 0, BookingSearchMark, + TinkoffSearchMark, + LocalAdsSearchMark, SearchMarkTypesCount }; diff --git a/partners_api/ads_engine.cpp b/partners_api/ads_engine.cpp index e7f0e75c2b..62af6cd6ed 100644 --- a/partners_api/ads_engine.cpp +++ b/partners_api/ads_engine.cpp @@ -1,4 +1,5 @@ #include "partners_api/ads_engine.hpp" +#include "partners_api/facebook_ads.hpp" #include "partners_api/mopub_ads.hpp" #include "partners_api/rb_ads.hpp" @@ -16,7 +17,7 @@ Engine::Engine() m_banners.emplace_back(Banner::Type::RB, my::make_unique()); m_banners.emplace_back(Banner::Type::Mopub, my::make_unique()); - m_searchBanners.emplace_back(Banner::Type::Mopub, my::make_unique()); + m_searchBanners.emplace_back(Banner::Type::Facebook, my::make_unique()); } bool Engine::HasBanner(feature::TypesHolder const & types, diff --git a/partners_api/facebook_ads.cpp b/partners_api/facebook_ads.cpp index 07b19d60f9..9d329bf360 100644 --- a/partners_api/facebook_ads.cpp +++ b/partners_api/facebook_ads.cpp @@ -4,8 +4,10 @@ namespace { #if defined(OMIM_OS_IPHONE) auto const kSingleBannerIdForAllTypes = "185237551520383_1450324925011633"; + auto const kSearchbannerId = "185237551520383_1453784847998974"; #else auto const kSingleBannerIdForAllTypes = "185237551520383_1450325641678228"; + auto const kSearchbannerId = "185237551520383_1384653791578747"; #endif } // namespace @@ -15,4 +17,14 @@ std::string Facebook::GetBannerIdForOtherTypes() const { return kSingleBannerIdForAllTypes; } + +bool Facebook::HasSearchBanner() const +{ + return true; +} + +std::string Facebook::GetSearchBannerId() const +{ + return kSearchbannerId; +} } // namespace ads diff --git a/partners_api/facebook_ads.hpp b/partners_api/facebook_ads.hpp index aa62be4046..380ff326b5 100644 --- a/partners_api/facebook_ads.hpp +++ b/partners_api/facebook_ads.hpp @@ -12,5 +12,7 @@ public: // ContainerBase overrides: std::string GetBannerIdForOtherTypes() const override; + bool HasSearchBanner() const override; + std::string GetSearchBannerId() const override; }; } // namespace ads diff --git a/partners_api/mopub_ads.cpp b/partners_api/mopub_ads.cpp index a27a7890f7..e7162b6d03 100644 --- a/partners_api/mopub_ads.cpp +++ b/partners_api/mopub_ads.cpp @@ -6,12 +6,10 @@ namespace auto const kTourismPlacementId = "29c1bc85b46442b5a370552916aa6822"; auto const kNavigationPlacementId = "00af522ea7f94b77b6c671c7e1b13c3f"; auto const kNonTourismPlacementId = "67ebcbd0af8345f18cccfb230ca08a17"; - auto const kSearchBannerId = "9f5480c4339e44a7894538176913cd90"; #else auto const kTourismPlacementId = "d298f205fb8a47aaafb514d2b5b8cf55"; auto const kNavigationPlacementId = "fbd54c31a20347a6b5d6654510c542a4"; auto const kNonTourismPlacementId = "94b8d70370a643929aa4c8c764d25e5b"; - auto const kSearchBannerId = "324f2f97bbd84b41b5fcfbd04b27b088"; #endif } // namespace @@ -77,14 +75,4 @@ std::string Mopub::GetBannerIdForOtherTypes() const { return kNonTourismPlacementId; } - -bool Mopub::HasSearchBanner() const -{ - return true; -} - -std::string Mopub::GetSearchBannerId() const -{ - return kSearchBannerId; -} } // namespace ads diff --git a/partners_api/mopub_ads.hpp b/partners_api/mopub_ads.hpp index 613ff222a7..97815de629 100644 --- a/partners_api/mopub_ads.hpp +++ b/partners_api/mopub_ads.hpp @@ -12,7 +12,5 @@ public: // ContainerBase overrides: std::string GetBannerIdForOtherTypes() const override; - bool HasSearchBanner() const override; - std::string GetSearchBannerId() const override; }; } // namespace ads diff --git a/partners_api/partners_api_tests/ads_engine_tests.cpp b/partners_api/partners_api_tests/ads_engine_tests.cpp index a63bf88ec7..db19dd7b63 100644 --- a/partners_api/partners_api_tests/ads_engine_tests.cpp +++ b/partners_api/partners_api_tests/ads_engine_tests.cpp @@ -5,6 +5,7 @@ #include "indexer/feature_data.hpp" #include "partners_api/ads_engine.hpp" +#include "partners_api/facebook_ads.hpp" #include "partners_api/mopub_ads.hpp" #include "partners_api/rb_ads.hpp" @@ -134,12 +135,13 @@ UNIT_TEST(AdsEngine_Smoke) auto result = engine.GetBanners(holder, {"Russian Federation"}, "ru"); TEST(result.empty(), ()); } + ads::Facebook facebook; { TEST(engine.HasSearchBanner(), ()); auto result = engine.GetSearchBanners(); TEST_EQUAL(result.size(), 1, ()); - TEST_EQUAL(result[0].m_type, ads::Banner::Type::Mopub, ()); - TEST_EQUAL(result[0].m_bannerId, mopub.GetSearchBannerId(), ()); + TEST_EQUAL(result[0].m_type, ads::Banner::Type::Facebook, ()); + TEST_EQUAL(result[0].m_bannerId, facebook.GetSearchBannerId(), ()); } } } diff --git a/platform/CMakeLists.txt b/platform/CMakeLists.txt index d80c6c7f1c..be3145947c 100644 --- a/platform/CMakeLists.txt +++ b/platform/CMakeLists.txt @@ -44,6 +44,8 @@ set( settings.cpp settings.hpp socket.hpp + string_storage_base.cpp + string_storage_base.hpp ) if(${PLATFORM_IPHONE}) diff --git a/platform/marketing_service.cpp b/platform/marketing_service.cpp index 7693080079..d7d5f1337a 100644 --- a/platform/marketing_service.cpp +++ b/platform/marketing_service.cpp @@ -30,6 +30,12 @@ char const * const kPlacepageHotelBook = "Placepage_Hotel_book"; char const * const kEditorAddStart = "EditorAdd_start"; char const * const kEditorEditStart = "EditorEdit_start"; +// Settings. +char const * const kFrom = "utm_source"; +char const * const kType = "utm_medium"; +char const * const kName = "utm_campaign"; +char const * const kContent = "utm_content"; +char const * const kKeyword = "utm_term"; } // marketing void MarketingService::ProcessFirstLaunch() diff --git a/platform/marketing_service.hpp b/platform/marketing_service.hpp index de011f908c..26db60aa97 100644 --- a/platform/marketing_service.hpp +++ b/platform/marketing_service.hpp @@ -34,6 +34,13 @@ extern char const * const kBookmarksBookmarkAction; extern char const * const kPlacepageHotelBook; extern char const * const kEditorAddStart; extern char const * const kEditorEditStart; + +// Settings. +extern char const * const kFrom; +extern char const * const kType; +extern char const * const kName; +extern char const * const kContent; +extern char const * const kKeyword; } // marketing class MarketingService diff --git a/platform/platform.pro b/platform/platform.pro index aecbb744f5..c355e58bbf 100644 --- a/platform/platform.pro +++ b/platform/platform.pro @@ -92,6 +92,7 @@ HEADERS += \ servers_list.hpp \ settings.hpp \ socket.hpp \ + string_storage_base.hpp \ SOURCES += \ chunks_download_strategy.cpp \ @@ -111,3 +112,4 @@ SOURCES += \ preferred_languages.cpp \ servers_list.cpp \ settings.cpp \ + string_storage_base.cpp \ diff --git a/platform/settings.cpp b/platform/settings.cpp index cbeccacf11..adc510b714 100644 --- a/platform/settings.cpp +++ b/platform/settings.cpp @@ -17,67 +17,12 @@ #include "std/iostream.hpp" #include "std/sstream.hpp" -namespace -{ -constexpr char kDelimChar = '='; -} // namespace - namespace settings { char const * kLocationStateMode = "LastLocationStateMode"; char const * kMeasurementUnits = "Units"; -StringStorage::StringStorage() -{ - try - { - string settingsPath = GetPlatform().SettingsPathForFile(SETTINGS_FILE_NAME); - LOG(LINFO, ("Settings path:", settingsPath)); - ReaderStreamBuf buffer(make_unique(settingsPath)); - istream stream(&buffer); - - string line; - while (getline(stream, line)) - { - if (line.empty()) - continue; - - size_t const delimPos = line.find(kDelimChar); - if (delimPos == string::npos) - continue; - - string const key = line.substr(0, delimPos); - string const value = line.substr(delimPos + 1); - if (!key.empty() && !value.empty()) - m_values[key] = value; - } - } - catch (RootException const & ex) - { - LOG(LWARNING, ("Loading settings:", ex.Msg())); - } -} - -void StringStorage::Save() const -{ - try - { - FileWriter file(GetPlatform().SettingsPathForFile(SETTINGS_FILE_NAME)); - for (auto const & value : m_values) - { - string line(value.first); - line += kDelimChar; - line += value.second; - line += '\n'; - file.Write(line.data(), line.size()); - } - } - catch (RootException const & ex) - { - // Ignore all settings saving exceptions. - LOG(LWARNING, ("Saving settings:", ex.Msg())); - } -} +StringStorage::StringStorage() : StringStorageBase(GetPlatform().SettingsPathForFile(SETTINGS_FILE_NAME)) {} StringStorage & StringStorage::Instance() { @@ -85,45 +30,6 @@ StringStorage & StringStorage::Instance() return inst; } -void StringStorage::Clear() -{ - lock_guard guard(m_mutex); - m_values.clear(); - Save(); -} - -bool StringStorage::GetValue(string const & key, string & outValue) const -{ - lock_guard guard(m_mutex); - - auto const found = m_values.find(key); - if (found == m_values.end()) - return false; - - outValue = found->second; - return true; -} - -void StringStorage::SetValue(string const & key, string && value) -{ - lock_guard guard(m_mutex); - - m_values[key] = move(value); - Save(); -} - -void StringStorage::DeleteKeyAndValue(string const & key) -{ - lock_guard guard(m_mutex); - - auto const found = m_values.find(key); - if (found != m_values.end()) - { - m_values.erase(found); - Save(); - } -} - //////////////////////////////////////////////////////////////////////////////////////////// template <> @@ -434,3 +340,15 @@ bool IsFirstLaunchForDate(int date) return false; } } // namespace settings + +namespace marketing +{ +Settings::Settings() : platform::StringStorageBase(GetPlatform().SettingsPathForFile(MARKETING_SETTINGS_FILE_NAME)) {} + +// static +Settings & Settings::Instance() +{ + static Settings instance; + return instance; +} +} // namespace marketing diff --git a/platform/settings.hpp b/platform/settings.hpp index 7cb718f1ed..e6d42945da 100644 --- a/platform/settings.hpp +++ b/platform/settings.hpp @@ -1,10 +1,10 @@ #pragma once +#include "platform/string_storage_base.hpp" + #include "base/macros.hpp" #include "std/string.hpp" -#include "std/map.hpp" -#include "std/mutex.hpp" namespace settings { @@ -18,36 +18,26 @@ bool FromString(string const & str, T & outValue); template string ToString(T const & value); -class StringStorage +class StringStorage : public platform::StringStorageBase { - typedef map ContainerT; - ContainerT m_values; - - mutable mutex m_mutex; - - StringStorage(); - void Save() const; - public: static StringStorage & Instance(); - void Clear(); - bool GetValue(string const & key, string & outValue) const; - void SetValue(string const & key, string && value); - void DeleteKeyAndValue(string const & key); +private: + StringStorage(); }; /// Retrieve setting /// @return false if setting is absent -template -WARN_UNUSED_RESULT bool Get(string const & key, ValueT & outValue) +template +WARN_UNUSED_RESULT bool Get(string const & key, Value & outValue) { string strVal; return StringStorage::Instance().GetValue(key, strVal) && FromString(strVal, outValue); } /// Automatically saves setting to external file -template -void Set(string const & key, ValueT const & value) +template +void Set(string const & key, Value const & value) { StringStorage::Instance().SetValue(key, ToString(value)); } @@ -59,3 +49,27 @@ inline void Clear() { StringStorage::Instance().Clear(); } /// @param[in] date Current date in format yymmdd. bool IsFirstLaunchForDate(int date); } + +namespace marketing +{ +class Settings : public platform::StringStorageBase +{ +public: + template + static void Set(string const & key, Value const & value) + { + Instance().SetValue(key, settings::ToString(value)); + } + + template + WARN_UNUSED_RESULT static bool Get(string const & key, Value & outValue) + { + string strVal; + return Instance().GetValue(key, strVal) && settings::FromString(strVal, outValue); + } + +private: + static Settings & Instance(); + Settings(); +}; +} // namespace marketing diff --git a/platform/string_storage_base.cpp b/platform/string_storage_base.cpp new file mode 100644 index 0000000000..e6075f5104 --- /dev/null +++ b/platform/string_storage_base.cpp @@ -0,0 +1,111 @@ +#include "string_storage_base.hpp" + +#include "coding/reader_streambuf.hpp" +#include "coding/file_reader.hpp" +#include "coding/file_writer.hpp" + +#include "base/logging.hpp" +#include "base/exception.hpp" +#include "base/stl_add.hpp" + +#include + +using namespace std; + +namespace +{ +constexpr char kDelimChar = '='; +} // namespace + +namespace platform +{ +StringStorageBase::StringStorageBase(string const & path) : m_path(path) +{ + try + { + LOG(LINFO, ("Settings path:", m_path)); + ReaderStreamBuf buffer(make_unique(m_path)); + istream stream(&buffer); + + string line; + while (getline(stream, line)) + { + if (line.empty()) + continue; + + size_t const delimPos = line.find(kDelimChar); + if (delimPos == string::npos) + continue; + + string const key = line.substr(0, delimPos); + string const value = line.substr(delimPos + 1); + if (!key.empty() && !value.empty()) + m_values[key] = value; + } + } + catch (RootException const & ex) + { + LOG(LWARNING, ("Loading settings:", ex.Msg())); + } +} + +void StringStorageBase::Save() const +{ + try + { + FileWriter file(m_path); + for (auto const & value : m_values) + { + string line(value.first); + line += kDelimChar; + line += value.second; + line += '\n'; + file.Write(line.data(), line.size()); + } + } + catch (RootException const & ex) + { + // Ignore all settings saving exceptions. + LOG(LWARNING, ("Saving settings:", ex.Msg())); + } +} + +void StringStorageBase::Clear() +{ + lock_guard guard(m_mutex); + m_values.clear(); + Save(); +} + +bool StringStorageBase::GetValue(string const & key, string & outValue) const +{ + lock_guard guard(m_mutex); + + auto const found = m_values.find(key); + if (found == m_values.end()) + return false; + + outValue = found->second; + return true; +} + +void StringStorageBase::SetValue(string const & key, string && value) +{ + lock_guard guard(m_mutex); + + m_values[key] = move(value); + Save(); +} + +void StringStorageBase::DeleteKeyAndValue(string const & key) +{ + lock_guard guard(m_mutex); + + auto const found = m_values.find(key); + if (found != m_values.end()) + { + m_values.erase(found); + Save(); + } +} +} // namespace platform diff --git a/platform/string_storage_base.hpp b/platform/string_storage_base.hpp new file mode 100644 index 0000000000..ddb7de9831 --- /dev/null +++ b/platform/string_storage_base.hpp @@ -0,0 +1,25 @@ +#pragma once + +#include +#include +#include + +namespace platform +{ +class StringStorageBase +{ +public: + StringStorageBase(std::string const & path); + void Save() const; + void Clear(); + bool GetValue(std::string const & key, std::string & outValue) const; + void SetValue(std::string const & key, std::string && value); + void DeleteKeyAndValue(std::string const & key); + +private: + using Container = std::map; + Container m_values; + mutable std::mutex m_mutex; + std::string const m_path; +}; +} // namespace platform diff --git a/routing/edge_estimator.cpp b/routing/edge_estimator.cpp index 90b9f781a9..f0b5e584ac 100644 --- a/routing/edge_estimator.cpp +++ b/routing/edge_estimator.cpp @@ -74,8 +74,7 @@ double CarEdgeEstimator::CalcSegmentWeight(Segment const & segment, RoadGeometry double const speedMPS = road.GetSpeed() * kKMPH2MPS; double result = TimeBetweenSec(road.GetPoint(segment.GetPointId(false /* front */)), - road.GetPoint(segment.GetPointId(true /* front */)), speedMPS) * - kTimePenalty; + road.GetPoint(segment.GetPointId(true /* front */)), speedMPS); if (m_trafficStash) { @@ -89,7 +88,10 @@ double CarEdgeEstimator::CalcSegmentWeight(Segment const & segment, RoadGeometry SpeedGroup const speedGroup = (it == trafficColoring->cend()) ? SpeedGroup::Unknown : it->second; ASSERT_LESS(speedGroup, SpeedGroup::Count, ()); - result *= CalcTrafficFactor(speedGroup); + double const trafficFactor = CalcTrafficFactor(speedGroup); + result *= trafficFactor; + if (speedGroup != SpeedGroup::Unknown && speedGroup != SpeedGroup::G5) + result *= kTimePenalty; } } diff --git a/routing/index_graph_starter.cpp b/routing/index_graph_starter.cpp index ab5516b455..183ae6ddc2 100644 --- a/routing/index_graph_starter.cpp +++ b/routing/index_graph_starter.cpp @@ -1,6 +1,20 @@ #include "routing/index_graph_starter.hpp" -#include "routing/routing_exceptions.hpp" +#include "geometry/distance.hpp" + +namespace +{ +using namespace routing; + +m2::PointD CalcProjectionToSegment(Segment const & segment, m2::PointD const & point, + WorldGraph & graph) +{ + m2::ProjectionToSection projection; + projection.SetBounds(graph.GetPoint(segment, false /* front */), + graph.GetPoint(segment, true /* front */)); + return projection(point); +} +} // namespace namespace routing { @@ -10,7 +24,11 @@ Segment constexpr IndexGraphStarter::kFinishFakeSegment; IndexGraphStarter::IndexGraphStarter(FakeVertex const & start, FakeVertex const & finish, WorldGraph & graph) - : m_graph(graph), m_start(start), m_finish(finish) + : m_graph(graph) + , m_start(start.GetSegment(), + CalcProjectionToSegment(start.GetSegment(), start.GetPoint(), graph)) + , m_finish(finish.GetSegment(), + CalcProjectionToSegment(finish.GetSegment(), finish.GetPoint(), graph)) { } diff --git a/routing/index_graph_starter.hpp b/routing/index_graph_starter.hpp index 93e1edc6e4..197fc7aa4c 100644 --- a/routing/index_graph_starter.hpp +++ b/routing/index_graph_starter.hpp @@ -36,6 +36,7 @@ public: NumMwmId GetMwmId() const { return m_segment.GetMwmId(); } uint32_t GetFeatureId() const { return m_segment.GetFeatureId(); } m2::PointD const & GetPoint() const { return m_point; } + Segment const & GetSegment() const { return m_segment; } Segment GetSegmentWithDirection(bool forward) const { diff --git a/routing/index_router.cpp b/routing/index_router.cpp index 4ad1f2f411..4fbb94863f 100644 --- a/routing/index_router.cpp +++ b/routing/index_router.cpp @@ -40,7 +40,9 @@ bool IsDeadEnd(Segment const & segment, bool isOutgoing, WorldGraph & worldGraph { size_t constexpr kDeadEndTestLimit = 50; - auto const getVertexByEdgeFn = [](SegmentEdge const & edge) { return edge.GetTarget(); }; + auto const getVertexByEdgeFn = [](SegmentEdge const & edge) { + return edge.GetTarget(); + }; // Note. If |isOutgoing| == true outgoing edges are looked for. // If |isOutgoing| == false it's the finish. So ingoing edges are looked for. @@ -52,6 +54,35 @@ bool IsDeadEnd(Segment const & segment, bool isOutgoing, WorldGraph & worldGraph return !CheckGraphConnectivity(segment, kDeadEndTestLimit, worldGraph, getVertexByEdgeFn, getOutgoingEdgesFn); } + +// ReconstructRoute duplicates polyline internal points. +// Internal points are all polyline points except first and last. +// +// Need duplicate times also. +void DuplicateRouteTimes(size_t const polySize, Route::TTimes ×) +{ + if (polySize - 2 != (times.size() - 2) * 2) + { + LOG(LERROR, ("Can't duplicate route times, polyline:", polySize, ", times:", times.size())); + return; + } + + Route::TTimes duplicatedTimes; + duplicatedTimes.reserve(polySize); + size_t index = 0; + duplicatedTimes.emplace_back(index++, times.front().second); + + for (size_t i = 1; i < times.size() - 1; ++i) + { + double const time = times[i].second; + duplicatedTimes.emplace_back(index++, time); + duplicatedTimes.emplace_back(index++, time); + } + + duplicatedTimes.emplace_back(index++, times.back().second); + times = move(duplicatedTimes); + CHECK_EQUAL(times.size(), polySize, ()); +} } // namespace namespace routing @@ -91,6 +122,7 @@ IRouter::ResultCode IndexRouter::CalculateRoute(m2::PointD const & startPoint, { string const startCountry = m_countryFileFn(startPoint); string const finishCountry = m_countryFileFn(finalPoint); + return CalculateRoute(startCountry, finishCountry, false /* blockMwmBorders */, startPoint, startDirection, finalPoint, delegate, route); } @@ -141,6 +173,15 @@ IRouter::ResultCode IndexRouter::DoCalculateRoute(string const & startCountry, IndexGraphLoader::Create(m_numMwmIds, m_vehicleModelFactory, m_estimator, m_index), m_estimator); + bool const isStartMwmLoaded = m_index.IsLoaded(startFile); + bool const isFinishMwmLoaded = m_index.IsLoaded(finishFile); + if (!isStartMwmLoaded) + route.AddAbsentCountry(startCountry); + if (!isFinishMwmLoaded) + route.AddAbsentCountry(finishCountry); + if (!isStartMwmLoaded || !isFinishMwmLoaded) + return IRouter::NeedMoreMaps; + Edge startEdge; if (!FindClosestEdge(startFile, startPoint, true /* isOutgoing */, graph, startEdge)) return IRouter::StartPointNotFound; @@ -172,7 +213,7 @@ IRouter::ResultCode IndexRouter::DoCalculateRoute(string const & startCountry, IndexGraphStarter starter(start, finish, graph); AStarProgress progress(0, 100); - progress.Initialize(startPoint, finalPoint); + progress.Initialize(starter.GetStartVertex().GetPoint(), starter.GetFinishVertex().GetPoint()); uint32_t drawPointsStep = 0; auto onVisitJunction = [&](Segment const & from, Segment const & to) { @@ -235,6 +276,7 @@ bool IndexRouter::FindClosestEdge(platform::CountryFile const & file, m2::PointD { Edge const & edge = candidates[i].first; Segment const segment(numMwmId, edge.GetFeatureId().m_index, edge.GetSegId(), edge.IsForward()); + if (edge.GetFeatureId().m_mwmId != mwmId || IsDeadEnd(segment, isOutgoing, worldGraph)) continue; @@ -342,7 +384,8 @@ bool IndexRouter::RedressRoute(vector const & segments, RouterDelegate starter.GetGraph().SetMode(WorldGraph::Mode::NoLeaps); CHECK(m_directionsEngine, ()); - ReconstructRoute(*m_directionsEngine, roadGraph, m_trafficStash, delegate, junctions, route); + ReconstructRoute(*m_directionsEngine, roadGraph, m_trafficStash, delegate, + false /* hasAltitude */, junctions, route); if (!route.IsValid()) { @@ -360,8 +403,9 @@ bool IndexRouter::RedressRoute(vector const & segments, RouterDelegate times.emplace_back(static_cast(i), time); time += starter.CalcSegmentWeight(segments[i]); } - route.SetSectionTimes(move(times)); + DuplicateRouteTimes(route.GetPoly().GetSize(), times); + route.SetSectionTimes(move(times)); return true; } diff --git a/routing/index_router.hpp b/routing/index_router.hpp index 037c9509b7..43875f9352 100644 --- a/routing/index_router.hpp +++ b/routing/index_router.hpp @@ -70,7 +70,7 @@ private: m2::PointD const & finalPoint, RouterDelegate const & delegate, Route & route); - /// \brief Finds closest edges which may be considered as start or finish of the route. + /// \brief Finds closest edges which may be considered as start of finish of the route. /// \param isOutgoing == true is |point| is considered as the start of the route. /// isOutgoing == false is |point| is considered as the finish of the route. bool FindClosestEdge(platform::CountryFile const & file, m2::PointD const & point, diff --git a/routing/road_graph_router.cpp b/routing/road_graph_router.cpp index 52f059d7f3..97f7ae2bc2 100644 --- a/routing/road_graph_router.cpp +++ b/routing/road_graph_router.cpp @@ -201,8 +201,8 @@ IRouter::ResultCode RoadGraphRouter::CalculateRoute(m2::PointD const & startPoin ASSERT_GREATER(result.distance, 0., ()); CHECK(m_directionsEngine, ()); - ReconstructRoute(*m_directionsEngine, *m_roadGraph, nullptr /* trafficColoring */, - delegate, result.path, route); + ReconstructRoute(*m_directionsEngine, *m_roadGraph, nullptr, delegate, true /* hasAltitude */, + result.path, route); } m_roadGraph->ResetFakes(); diff --git a/routing/routing_helpers.cpp b/routing/routing_helpers.cpp index a7a556e2a9..9ccd4cc98e 100644 --- a/routing/routing_helpers.cpp +++ b/routing/routing_helpers.cpp @@ -9,7 +9,8 @@ using namespace traffic; void ReconstructRoute(IDirectionsEngine & engine, RoadGraphBase const & graph, shared_ptr const & trafficStash, - my::Cancellable const & cancellable, vector & path, Route & route) + my::Cancellable const & cancellable, bool hasAltitude, + vector & path, Route & route) { if (path.empty()) { @@ -47,14 +48,17 @@ void ReconstructRoute(IDirectionsEngine & engine, RoadGraphBase const & graph, vector routeGeometry; JunctionsToPoints(junctions, routeGeometry); - feature::TAltitudes altitudes; - JunctionsToAltitudes(junctions, altitudes); route.SetGeometry(routeGeometry.begin(), routeGeometry.end()); route.SetSectionTimes(move(times)); route.SetTurnInstructions(move(turnsDir)); route.SetStreetNames(move(streetNames)); - route.SetAltitudes(move(altitudes)); + if (hasAltitude) + { + feature::TAltitudes altitudes; + JunctionsToAltitudes(junctions, altitudes); + route.SetAltitudes(move(altitudes)); + } vector traffic; if (trafficStash && !trafficSegs.empty()) diff --git a/routing/routing_helpers.hpp b/routing/routing_helpers.hpp index 2633dd2ba7..4d5024ffee 100644 --- a/routing/routing_helpers.hpp +++ b/routing/routing_helpers.hpp @@ -31,7 +31,8 @@ bool IsRoad(TTypes const & types) void ReconstructRoute(IDirectionsEngine & engine, RoadGraphBase const & graph, shared_ptr const & trafficStash, - my::Cancellable const & cancellable, vector & path, Route & route); + my::Cancellable const & cancellable, bool hasAltitude, + vector & path, Route & route); /// \brief Checks is edge connected with world graph. Function does BFS while it finds some number /// of edges, diff --git a/routing/routing_settings.hpp b/routing/routing_settings.hpp index fffe554a50..f0692a3466 100644 --- a/routing/routing_settings.hpp +++ b/routing/routing_settings.hpp @@ -39,7 +39,7 @@ struct RoutingSettings inline RoutingSettings GetPedestrianRoutingSettings() { - return RoutingSettings({ false /* m_matchRoute */, false /* m_soundDirection */, + return RoutingSettings({ true /* m_matchRoute */, false /* m_soundDirection */, 20. /* m_matchingThresholdM */, true /* m_keepPedestrianInfo */, false /* m_showTurnAfterNext */, false /* m_speedCameraWarning*/}); } diff --git a/routing/routing_tests/index_graph_test.cpp b/routing/routing_tests/index_graph_test.cpp index 1a996fe129..44505eaf01 100644 --- a/routing/routing_tests/index_graph_test.cpp +++ b/routing/routing_tests/index_graph_test.cpp @@ -508,8 +508,13 @@ UNIT_CLASS_TEST(RestrictionTest, LoopGraph) routing::IndexGraphStarter::FakeVertex(kTestNumMwmId, 2, 0 /* seg id */, m2::PointD(0.00005, 0.0004)) /* finish */); - double constexpr kExpectedRouteTimeSec = 3.92527; - TestRouteTime(*m_starter, AStarAlgorithm::Result::OK, kExpectedRouteTimeSec); + vector const expectedRoute = {{kTestNumMwmId, 1, 0, true}, {kTestNumMwmId, 0, 0, true}, + {kTestNumMwmId, 0, 1, true}, {kTestNumMwmId, 0, 8, false}, + {kTestNumMwmId, 0, 7, false}, {kTestNumMwmId, 0, 6, false}, + {kTestNumMwmId, 2, 0, true}}; + + TestRoute(m_starter->GetStartVertex(), m_starter->GetFinishVertex(), 7, &expectedRoute, + m_starter->GetGraph()); } UNIT_TEST(IndexGraph_OnlyTopology_1) diff --git a/routing/routing_tests/index_graph_tools.cpp b/routing/routing_tests/index_graph_tools.cpp index d5de50bf1b..20fd44c99b 100644 --- a/routing/routing_tests/index_graph_tools.cpp +++ b/routing/routing_tests/index_graph_tools.cpp @@ -278,7 +278,8 @@ shared_ptr CreateEstimatorForCar(traffic::TrafficCache const & tr shared_ptr CreateEstimatorForCar(shared_ptr trafficStash) { - return EdgeEstimator::CreateForCar(trafficStash, 90.0 /* maxSpeedKMpH */); + return EdgeEstimator::CreateForCar(trafficStash, + CarModelFactory().GetVehicleModel()->GetMaxSpeed()); } AStarAlgorithm::Result CalculateRoute(IndexGraphStarter & starter, @@ -337,19 +338,6 @@ void TestRouteGeometry(IndexGraphStarter & starter, TEST_EQUAL(geom, expectedRouteGeom, ()); } -void TestRouteTime(IndexGraphStarter & starter, - AStarAlgorithm::Result expectedRouteResult, - double expectedTime) -{ - vector routeSegs; - double timeSec = 0.0; - auto const resultCode = CalculateRoute(starter, routeSegs, timeSec); - - TEST_EQUAL(resultCode, expectedRouteResult, ()); - double const kEpsilon = 1e-5; - TEST(my::AlmostEqualAbs(timeSec, expectedTime, kEpsilon), ()); -} - void TestRestrictions(vector const & expectedRouteGeom, AStarAlgorithm::Result expectedRouteResult, routing::IndexGraphStarter::FakeVertex const & start, diff --git a/routing/routing_tests/index_graph_tools.hpp b/routing/routing_tests/index_graph_tools.hpp index 345c891960..808e81b7a9 100644 --- a/routing/routing_tests/index_graph_tools.hpp +++ b/routing/routing_tests/index_graph_tools.hpp @@ -196,10 +196,6 @@ void TestRouteGeometry( routing::AStarAlgorithm::Result expectedRouteResult, vector const & expectedRouteGeom); -void TestRouteTime(IndexGraphStarter & starter, - AStarAlgorithm::Result expectedRouteResult, - double expectedTime); - /// \brief Applies |restrictions| to graph in |restrictionTest| and /// tests the resulting route. /// \note restrictionTest should have a valid |restrictionTest.m_graph|. diff --git a/routing_common/car_model.cpp b/routing_common/car_model.cpp index 07be768d81..f5d38bb8f4 100644 --- a/routing_common/car_model.cpp +++ b/routing_common/car_model.cpp @@ -8,18 +8,18 @@ namespace { -double constexpr kSpeedMotorwayKMpH = 90.0; +double constexpr kSpeedMotorwayKMpH = 115.37; double constexpr kSpeedMotorwayLinkKMpH = 75.0; -double constexpr kSpeedTrunkKMpH = 85.0; +double constexpr kSpeedTrunkKMpH = 93.89; double constexpr kSpeedTrunkLinkKMpH = 70.0; -double constexpr kSpeedPrimaryKMpH = 65.0; +double constexpr kSpeedPrimaryKMpH = 84.29; double constexpr kSpeedPrimaryLinkKMpH = 60.0; -double constexpr kSpeedSecondaryKMpH = 55.0; +double constexpr kSpeedSecondaryKMpH = 72.23; double constexpr kSpeedSecondaryLinkKMpH = 50.0; -double constexpr kSpeedTertiaryKMpH = 40.0; +double constexpr kSpeedTertiaryKMpH = 62.63; double constexpr kSpeedTertiaryLinkKMpH = 30.0; double constexpr kSpeedResidentialKMpH = 25.0; -double constexpr kSpeedUnclassifiedKMpH = 25.0; +double constexpr kSpeedUnclassifiedKMpH = 51.09; double constexpr kSpeedServiceKMpH = 15.0; double constexpr kSpeedLivingStreetKMpH = 10.0; double constexpr kSpeedRoadKMpH = 10.0; diff --git a/search/intermediate_result.cpp b/search/intermediate_result.cpp index a8a474e325..f0c37fef80 100644 --- a/search/intermediate_result.cpp +++ b/search/intermediate_result.cpp @@ -51,6 +51,8 @@ void ProcessMetadata(FeatureType const & ft, Result::Metadata & meta) else meta.m_stars = 0; + meta.m_isSponsoredBank = ftypes::IsTinkoffChecker::Instance()(ft); + bool const isSponsoredHotel = ftypes::IsBookingChecker::Instance()(ft); meta.m_isSponsoredHotel = isSponsoredHotel; meta.m_isHotel = ftypes::IsHotelChecker::Instance()(ft); diff --git a/search/result.hpp b/search/result.hpp index b583b5032c..3634108d8b 100644 --- a/search/result.hpp +++ b/search/result.hpp @@ -37,6 +37,7 @@ public: string m_hotelRating; int m_stars = 0; bool m_isSponsoredHotel = false; + bool m_isSponsoredBank = false; bool m_isHotel = false; osm::YesNoUnknown m_isOpenNow = osm::Unknown; // Valid for any result. diff --git a/storage/storage.cpp b/storage/storage.cpp index 515b0ce6dc..8b874ec683 100644 --- a/storage/storage.cpp +++ b/storage/storage.cpp @@ -114,18 +114,24 @@ Storage::Storage(string const & pathToCountriesFile /* = COUNTRIES_FILE */, , m_currentSlotId(0) , m_dataDir(dataDir) , m_downloadMapOnTheMap(nullptr) + , m_maxMwmSizeBytes(0) { SetLocale(languages::GetCurrentTwine()); LoadCountriesFile(pathToCountriesFile, m_dataDir); + CalMaxMwmSizeBytes(); } Storage::Storage(string const & referenceCountriesTxtJsonForTesting, unique_ptr mapDownloaderForTesting) - : m_downloader(move(mapDownloaderForTesting)), m_currentSlotId(0), m_downloadMapOnTheMap(nullptr) + : m_downloader(move(mapDownloaderForTesting)) + , m_currentSlotId(0) + , m_downloadMapOnTheMap(nullptr) + , m_maxMwmSizeBytes(0) { m_currentVersion = LoadCountries(referenceCountriesTxtJsonForTesting, m_countries, m_affiliations); CHECK_LESS_OR_EQUAL(0, m_currentVersion, ("Can't load test countries file")); + CalMaxMwmSizeBytes(); } void Storage::Init(TUpdateCallback const & didDownload, TDeleteCallback const & willDelete) @@ -1310,6 +1316,19 @@ bool Storage::IsDisputed(TCountryTreeNode const & node) const return found.size() > 1; } +void Storage::CalMaxMwmSizeBytes() +{ + m_maxMwmSizeBytes = 0; + m_countries.GetRoot().ForEachInSubtree([&](TCountryTree::Node const & node) { + if (node.ChildrenCount() == 0) + { + TMwmSize mwmSizeBytes = node.Value().GetSubtreeMwmSizeBytes(); + if (mwmSizeBytes > m_maxMwmSizeBytes) + m_maxMwmSizeBytes = mwmSizeBytes; + } + }); +} + StatusAndError Storage::GetNodeStatusInfo( TCountryTreeNode const & node, vector> & disputedTerritories, bool isDisputedTerritoriesCounted) const diff --git a/storage/storage.hpp b/storage/storage.hpp index 57e9c8a92f..cf753e040f 100644 --- a/storage/storage.hpp +++ b/storage/storage.hpp @@ -240,6 +240,8 @@ private: // Note. |m_affiliations| is empty in case of countries_obsolete.txt. TMappingAffiliations m_affiliations; + TMwmSize m_maxMwmSizeBytes; + ThreadChecker m_threadChecker; void DownloadNextCountryFromQueue(); @@ -532,6 +534,8 @@ public: /// Sets and gets locale, which is used to get localized counries names void SetLocale(string const & locale); string GetLocale() const; + + TMwmSize GetMaxMwmSizeBytes() const { return m_maxMwmSizeBytes; } // for testing: void SetDownloaderForTesting(unique_ptr && downloader); @@ -635,6 +639,8 @@ private: void ForEachAncestorExceptForTheRoot(vector const & nodes, ToDo && toDo) const; /// Returns true if |node.Value().Name()| is a disputed territory and false otherwise. bool IsDisputed(TCountryTreeNode const & node) const; + + void CalMaxMwmSizeBytes(); }; void GetQueuedCountries(Storage::TQueue const & queue, TCountriesSet & resultCountries); diff --git a/storage/storage_helpers.cpp b/storage/storage_helpers.cpp index d19568c4c6..bb705df5c7 100644 --- a/storage/storage_helpers.cpp +++ b/storage/storage_helpers.cpp @@ -20,20 +20,27 @@ bool IsDownloadFailed(Status status) status == Status::EUnknown; } -bool IsEnoughSpaceForDownload(TMwmSize size) +bool IsEnoughSpaceForDownload(TMwmSize mwmSize) { - // Mwm size is less than kMaxMwmSizeBytes. In case of map update at first we download updated map - // and only after that we do delete the obsolete map. So in such a case we might need up to - // kMaxMwmSizeBytes of extra space. - return GetPlatform().GetWritableStorageStatus(size + kMaxMwmSizeBytes) == + // Additional size which is necessary to have on flash card to download file of mwmSize bytes. + TMwmSize constexpr kExtraSizeBytes = 10 * 1024 * 1024; + return GetPlatform().GetWritableStorageStatus(mwmSize + kExtraSizeBytes) == Platform::TStorageStatus::STORAGE_OK; } +bool IsEnoughSpaceForDownload(TMwmSize mwmSizeDiff, TMwmSize maxMwmSize) +{ + // Mwm size is less than |maxMwmSize|. In case of map update at first we download updated map + // and only after that we do delete the obsolete map. So in such a case we might need up to + // |maxMwmSize| of extra space. + return IsEnoughSpaceForDownload(mwmSizeDiff + maxMwmSize); +} + bool IsEnoughSpaceForDownload(TCountryId const & countryId, Storage const & storage) { NodeAttrs nodeAttrs; storage.GetNodeAttrs(countryId, nodeAttrs); - return IsEnoughSpaceForDownload(nodeAttrs.m_mwmSize - nodeAttrs.m_localMwmSize); + return IsEnoughSpaceForDownload(nodeAttrs.m_mwmSize); } bool IsEnoughSpaceForUpdate(TCountryId const & countryId, Storage const & storage) @@ -42,7 +49,7 @@ bool IsEnoughSpaceForUpdate(TCountryId const & countryId, Storage const & storag storage.GetUpdateInfo(countryId, updateInfo); TMwmSize spaceNeedForUpdate = updateInfo.m_sizeDifference > 0 ? updateInfo.m_sizeDifference : 0; - return IsEnoughSpaceForDownload(spaceNeedForUpdate); + return IsEnoughSpaceForDownload(spaceNeedForUpdate, storage.GetMaxMwmSizeBytes()); } m2::RectD CalcLimitRect(TCountryId const & countryId, diff --git a/storage/storage_helpers.hpp b/storage/storage_helpers.hpp index d0593742c9..dd41f88324 100644 --- a/storage/storage_helpers.hpp +++ b/storage/storage_helpers.hpp @@ -13,8 +13,6 @@ namespace storage class CountryInfoGetter; class Storage; -TMwmSize constexpr kMaxMwmSizeBytes = 100 /*Mb*/ * 1024 * 1024; - /// \returns true if |position| is covered by a downloaded mwms and false otherwise. /// \note |position| has coordinates in mercator. /// \note This method takes into acount only maps enumerated in countries.txt. @@ -24,11 +22,11 @@ bool IsPointCoveredByDownloadedMaps(m2::PointD const & position, bool IsDownloadFailed(Status status); -bool IsEnoughSpaceForDownload(TMwmSize size); +bool IsEnoughSpaceForDownload(TMwmSize mwmSize); +bool IsEnoughSpaceForDownload(TMwmSize mwmSizeDiff, TMwmSize maxMwmSize); bool IsEnoughSpaceForDownload(TCountryId const & countryId, Storage const & storage); bool IsEnoughSpaceForUpdate(TCountryId const & countryId, Storage const & storage); - /// \brief Calculates limit rect for |countryId| (expandable or not). /// \returns bounding box in mercator coordinates. m2::RectD CalcLimitRect(TCountryId const & countryId, diff --git a/strings.txt b/strings.txt index 943763a68e..99b2216208 100644 --- a/strings.txt +++ b/strings.txt @@ -5110,22 +5110,6 @@ en = Information ru = Информация - [prefs_languages_information] - comment = Settings languages information in voice instructions screen - tags = android - en = Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.). - ru = Написать о том когда вообще ничего не установлено\n\nНа Android голосовые подсказки доступны на 24 языках: русский, английский, арабский, венгерский, голландский, греческий, датский, индонезийский, испанский, итальянский, китайский (традиционный и упрощенный), корейский, немецкий, польский, португальский, румынский, тайский, турецкий, финский, французский, хинди, чешский, японский.\n\nВозможно, для некоторых языков вам необходимо будет установить сторонний синтезатор речи и дополнительный языковой пакет из магазина приложений (Google Play Маркет, Samsung Apps и др.). - - [prefs_languages_information_off] - comment = Settings languages off information in voice instructions screen - tags = android - en = For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine. - ru = For some languages, you will need to install a other speech synthesizer or an additional language pack from the app store (Google Play Market, Samsung Apps).\n\nOpen your device's settings –> Language and input –> Speech –> Text to speech output.*\n\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine. - - [prefs_languages_information_off_link] - en = For more information please check the guide. - ru = Для получения дополнительной информации, пожалуйста, ознакомьтесь с руководством. - [prefs_group_map] comment = Settings screen: "Map" category title tags = android @@ -6910,17 +6894,6 @@ el = Σχόλια sk = Spätná väzba - [feedback_general] - comment = Settings: "Send general feedback" button - tags = android - en = General Feedback - ru = Отправить отзыв - fr = Avis général - de = Allgemeine Rückmeldung - pl = Ogólne opinie - zh-Hant = 一般意見反應 - el = Γενικάό σχόλιο - [subscribe_to_news] comment = Text in menu tags = ios, android @@ -20621,34 +20594,36 @@ sk = Obnoviť [booking_filters_rating] - en = Rating - ru = Рейтинг - ar = تصنيف - cs = Hodnocení - da = Vurdering - nl = Beoordeling - fi = Arvio - fr = Note - de = Bewertung - hu = Minősítés - id = Peringkat - it = Voto - ja = 評価 - ko = 평가 - nb = Vurdering - pl = Ocena - pt = Classificação - ro = Clasificare - es = Clasificación - sv = Betyg - th = อันดับ - tr = Oy Verin - uk = Рейтинг - vi = Cho điểm - zh-Hans = 评分 - zh-Hant = 評分 - el = Βαθμολογία - sk = Hodnotenie + comment = Beginning from a particular value and + en = Rating from + ru = Рейтинг от + ar = تصنيف من + cs = Hodnocení od + da = Vurdering fra + nl = Rating van + fi = Arvio vähintään + fr = Note à partir de + de = Bewertung von + hu = Besorolás innentől + id = Peringkat dari + it = Voto da + ja = 指定評価以上 + ko = 등급 + nb = Rangering fra + pl = Ocena od + pt = Com classificação desde + ro = Evaluări de la + es = Con calificación desde + sv = Betyg från + th = คะแนนตั้งแต่ + tr = En düşük derece + uk = Рейтинг від + vi = Hạng từ + zh-Hans = 最低评分 + zh-Hant = 評分下限 + el = Βαθμολογία από + sk = Hodnotenie nad + sw = Kadirio kuanzia [booking_filters_rating_any] en = Any @@ -21288,6 +21263,7 @@ sk = Objednanie taxíka je dočasne nedostupné. [advertisement] + comment = Abbreviated for all languages. en = AD [mobile_data_dialog] @@ -23152,22 +23128,192 @@ [whats_new_auto_update_updating_maps] en = Updating maps ru = Обновляем карты + ar = تحديث الخرائط + cs = Aktualizuji mapy + da = Opdaterer kort + nl = Kaarten bijwerken + fi = Päivitetään karttoja + fr = Mise à jour des cartes + de = Kartenaktualisierung + hu = Térképek frissítése + id = Memperbarui peta + it = Aggiornamento mappe + ja = 地図を更新中 + ko = 지도 업데이트 + nb = Oppdaterer kart + pl = Aktualizacja map + pt = Atualização de mapas + ro = Se actualizează hărțile + es = Actualizando mapas + sv = Uppdaterar kartor + th = กำลังอัปเดตแผนที่ + tr = Haritalar güncelleniyor + uk = Оновлення карт + vi = Đang cập nhật bản đồ + zh-Hans = 正在更新地图 + zh-Hant = 更新地圖 + af = Kaarte bywerk + be = Абнаўленне карт + el = Ενημέρωση χαρτών + es_MX = Actualización de mapas + fr_CA = Mise à jour des cartes + he = מעדכן מפות + hi = मानचित्र अपडेट हो रहे + pt_BR = Atualizando mapas + sk = Prebieha aktualizácia máp + sw = Inasasisha ramani [whats_new_auto_update_title] en = Update your downloaded maps ru = Обновите ваши загруженные карты + ar = قم بتحديث الخرائط التي قمت بنتزيلها + cs = Aktualizujte své stažené mapy + da = Opdater dine downloadede kort + nl = Werk uw gedownloade kaarten bij + fi = Päivitä ladatut kartat + fr = Mettez à jour vos cartes téléchargées + de = Aktualisieren Sie Ihre heruntergeladenen Karten + hu = Frissítse a letöltött térképeit + id = Perbarui peta yang sudah Anda unduh + it = Aggiorna le mappe scaricate + ja = ダウンロード済みのマップを更新してください + ko = 다운로드한 지도를 업데이트해야 합니다 + nb = Oppdater dine nedlastede kart + pl = Zaktualizuj pobrane mapy + pt = Atualize seus mapas transferidos + ro = Actualizați hărțile descărcate + es = Actualice sus mapas descargados + sv = Uppdatera dina nedladdade kartor + th = อัปเดตแผนที่ที่คุณดาวน์โหลดมา + tr = İndirdiğiniz haritaları güncelleyin + uk = Оновити завантажені карти + vi = Cập nhật các bản đồ đã tải về của bạn + zh-Hans = 更新已下载的地图 + zh-Hant = 更新您下載的地圖 + af = Werk jou afgelaaide kaarte by + be = Абнавіце спампаваныя карты + el = Θα πρέπει να ενημερώστε τους χάρτες που έχετε κατεβάσει + es_MX = Debe actualizar sus mapas descargados + fr_CA = Mettez à jour vos cartes téléchargées + he = עדכן את המפות שהורדת + hi = अपने डाउनलोड किए गए मानचित्र अपडेट करें + pt_BR = Atualize os mapas no seu dispositivo + sk = Aktualizujte svoje stiahnuté mapy + sw = Sasisha ramani zako ulizopakua [whats_new_auto_update_message] - en = Update maps supports information about objects in the current state + en = Updating maps keeps the information about objects up to date ru = Обновление карт поддерживает информацию об объектах в актуальном состоянии + ar = تحديث الخرائط والاحتفاظ بالمعلومات حول الكائنات محدثة + cs = Aktualizace map zajišťuje aktuální informace o objektech + da = Opdatering af kort sikrer, at oplysningerne om objekter er aktuel + nl = Kaarten bijwerken houdt de informatie over objecten actueel + fi = Karttojen päivittäminen pitää kohteita koskevat tiedot ajan tasalla + fr = Actualiser les cartes permet d'actualiser également les informations sur les objets + de = Das Aktualisieren der Karten sorgt dafür, dass die Objektinformationen stets auf dem neuesten Stand sind + hu = A térképek frissítésével naprakészen tarthatja az objektumokra vonatkozó adatokat + id = Memperbarui peta membuat informasi tentang objek tetap terkini + it = Aggiornamento mappe mantiene aggiornate le informazioni sugli oggetti + ja = 地図を更新することで物件情報を最新の状態に保ちます + ko = 지도를 업데이트하면 개체에 대한 정보가 최신 상태로 유지됩니다. + nb = Ved å oppdatere kart holder du også informasjonen om ulike elementer oppdatert + pl = Aktualizacja map umożliwia uzyskanie bieżących informacji o obiektach + pt = Atualizar os mapas mantém atualizada a informação sobre objetos + ro = Actualizarea hărților vă ajută să păstrați actualizate informațiile despre obiecte + es = La actualización de mapas mantiene actualizada la información sobre objetos + sv = Uppdatering av kartor håller information om objekt uppdaterade + th = การอัปเดตแผนที่จะคงข้อมูลเกี่ยวกับจุดหมายต่าง ๆ ให้ล่าสุดอยู่เสมอ + tr = Haritaları güncellemek, nesnelerle ilgili bilgilerin güncel kalmasını sağlar + uk = Оновлення карт дозволяє підтримувати інформацію про об'єкти в актуальному стані + vi = Cập nhật bản đồ để cập nhật thông tin về các đối tượng trên đó + zh-Hans = 更新地图可以让对象的信息保持最新状态 + zh-Hant = 更新地圖以讓物件資訊保持在最新狀態 + af = As jy kaarte bywerk, bly inligting oor voorwerpe op datum + be = Абнаўленне карт падтрымлівае актуальнасць звестак пра аб’екты + el = Η ενημέρωση των χαρτών διατηρεί τις πληροφορίες των στοιχείων επικαιροποιημένες + es_MX = Actualizar los mapas mantiene actualizada también la información acerca de los objetos + fr_CA = La mise à jour des cartes permet d'avoir des informations à jour sur les objets + he = עדכון המפות שומר על המידע שבהן עדכני + hi = मानचित्रों का अपडेट होना ऑब्जेक्ट्स के बारे में जानकारी अप टू डेट रखता है + pt_BR = A atualização de mapas mantém as informações sobre objetos atualizadas + sk = Vďaka aktualizácii máp budú informácie o objektoch na mape aktualizované + sw = Kusasisha ramani kunaweka taarifa kuhusu vipengee ikiwa ya hivi sasa zaidi [whats_new_auto_update_button_size] en = Update (%s) ru = Обновить (%s) + ar = تحديث (%s) + cs = Aktualizace (%s) + da = Opdater (%s) + nl = Bijwerken (%s) + fi = Päivitä (%s) + fr = Mettre à jour (%s) + de = Aktualisieren (%s) + hu = Frissítés (%s) + id = Pembaruan (%s) + it = Aggiorna (%s) + ja = 更新 (%s) + ko = 업데이트(%s) + nb = Oppdater (%s) + pl = Zaktualizuj (%s) + pt = Atualização (%s) + ro = Actualizare (%s) + es = Actualizar (%s) + sv = Uppdatera (%s) + th = อัปเดต (%s) + tr = Güncelle (%s) + uk = Оновити (%s) + vi = Cập nhật (%s) + zh-Hans = 更新 (%s) + zh-Hant = 更新 (%s) + af = Werk by (%s) + be = Абнавіць (%s) + el = Ενημέρωση (%s) + es_MX = Actualizar (%s) + fr_CA = Mettre à jour (%s) + he = עדכן (%s) + hi = (%s) अपडेट करें + pt_BR = Atualizar (%s) + sk = Aktualizovať (%s) + sw = Sasisha (%s) [whats_new_auto_update_button_later] - en = Manually update later + en = Manually update later ru = Обновить вручную позже + ar = تحديث يدوياً في وقت لاحق + cs = Aktualizovat ručně později + da = Opdater manuelt senere + nl = Later handmatig bijwerken + fi = Päivitä manuaalisesti myöhemmin + fr = Mettre à jour manuellement plus tard + de = Später manuell aktualisieren + hu = Kézi frissítés később + id = Perbarui secara manual nanti + it = Aggiorna manualmente più tardi + ja = あとで手動で更新 + ko = 나중에 수동으로 업데이트 + nb = Oppdater manuelt senere + pl = Zaktualizuj ręcznie później + pt = Atualizar manualmente mais tarde + ro = Actualizare manuală mai târziu + es = Actualizar más tarde de forma manual + sv = Uppdatera senare manuellt + th = อัปเดตด้วยตนเองภายหลัง + tr = Daha sonra manüel olarak güncelle + uk = Оновити вручну пізніше + vi = Cập nhật thủ công sau + zh-Hans = 稍后手动更新 + zh-Hant = 稍後手動更新 + af = Werk later handmatig by + be = Абнавіць пазней уручную + el = Χειροκίνητη ενημέρωση αργότερα + es_MX = Actualizar después manualmente + fr_CA = Plus tard (manuel) + he = עדכן ידנית מאוחר יותר + hi = बाद में मैनुअल रूप से अपडेट करें + pt_BR = Atualizar manualmente mais tarde + sk = Manuálne aktualizovať neskôr + sw = Sasisha mwenyewe baadaye [search_hotel_filter_apartment] en = Apartments @@ -23216,7 +23362,7 @@ ko = ^캠핑 nb = Overnatting i bobiler pl = Kamping - pt: = Acampamento + pt = Acampamento ro = Camping es = Campamento sv = Camping @@ -23352,20 +23498,423 @@ el = Θέρετρο sk = Rezort + [search_hotel_filter_hotel] + en = Hotel + ru = Гостиница + ar = الفندق + cs = Hotel + da = Hotel + nl = Hotel + fi = Hotelli + fr = Hôtel + de = Hotel + hu = Szálloda + id = Hotel + it = Hôtel + ja = ホテル + ko = 호텔 + nb = Hotell + pl = Hotel + pt = Hotel + ro = Hotel + es = Hotel + sv = Hotell + th = โรงแรม + tr = Otel + uk = Готель + vi = Khách sạn + zh-Hans = 旅店 + zh-Hant = 飯店 + el = Ξενοδοχείο + he = מלון + sk = Hotel + [search_hotel_filter_motel] en = Motel ru = Мотель + ar = موتيل + cs = Motel + da = Motel + nl = Motel + fi = Motelli + fr = Motel + de = Motel + hu = Motel + id = Motel + it = Motel + ja = モーテル + ko = 모텔 + nb = Motell + pl = Motel + pt = Motel + ro = Motel + es = Motel + sv = Motell + th = โมเต็ล + tr = Motel + uk = Мотель + vi = Nhà nghỉ + zh-Hans = 汽车旅馆 + zh-Hant = 汽車旅館 + el = Μοτέλ + sk = Motel + sw = Moteli [create_campaign_button] - en = Create ad campaign + en = Claim this business + ru = Я владелец компании + ar = مطالبة هذه الشركة + cs = Zaregistruj si tento podnik + da = Denne virksomhed tilhører mig + nl = Dit bedrijf claimen + fi = Ilmoittaudu yrityksen omistajaksi + fr = Cette entreprise m'appartient + de = Ist das Ihr Unternehmen? + hu = Igényelje ezt az üzletet + id = Klaim bisnis ini + it = Rivendica questa attività + ja = この企業の所有者であることを報告 + ko = 이 비즈니스 클레임 + nb = Dette er min bedrift + pl = Zweryfikuj jako moja firma + pt = Reivindicar este negócio + ro = Revendicați această afacere + es = Este negocio es mío + sv = Gör anspråk på det här företaget + th = อ้างสิทธิ์ในธุรกิจนี้ + tr = Bu iş yerinin sahibiyim + uk = Я — власник + vi = Tôi là chủ doanh nghiệp này + zh-Hans = 认领此商家 + zh-Hant = 聲明這是你的公司 + el = Καταχωρήστε αυτήν την επιχείρηση + sk = Nárokovať záznam firmy + sw = Miliki biashara hii [view_campaign_button] - en = View ad campagain + en = Business is advertised + ru = Эта компания рекламируется + ar = تم عمل إعلان عن الشركة + cs = Podnik je propagován + da = Virksomhed er annonceret + nl = Bedrijf wordt geadverteerd + fi = Yritystä mainostetaan + fr = L'entreprise est publiée + de = Es wird für das Unternehmen geworben + hu = Hirdetett üzlet + id = Bisnis diiklankan + it = Attività pubblicizzata + ja = 企業は宣伝中です + ko = 비즈니스 광고를 하고 있습니다. + nb = Virksomheten er annonsert + pl = Firma jest reklamowana + pt = Negócio publicitado + ro = Afacerea este promovată + es = Anuncio destacado + sv = Företaget marknadsförs + th = ธุรกิจได้รับการโฆษณาแล้ว + tr = İşletme reklamı verildi + uk = Ця компанія рекламується + vi = Doanh nghiệp này được quảng cáo + zh-Hans = 商家已推广 + zh-Hant = 業務已發出廣告 + el = Η επιχείριση διαφημίζεται + sk = Firma sa inzeruje + sw = Biashara imetangazwa + + [search_hotel_filters_type] + en = Type + ru = Тип + ar = النوع + cs = Typ + da = Type + nl = Type + fi = Tyyppi + fr = Type + de = Art + hu = Típus + id = Jenis + it = Tipo + ja = 種類 + ko = 유형 + nb = Type + pl = Typ + pt = Tipo + ro = Tip + es = Tipo + sv = Typ + th = ประเภท + tr = Tür + uk = Тип + vi = Loại + zh-Hans = 类型 + zh-Hant = 類型 + el = Τύπος + sk = Typ + sw = Aina + + [feedback_general] + comment = Settings: "Send general feedback" button + tags = android + en = General Feedback + ru = Отправить отзыв + ar = تعقيب عام + cs = Všeobecné připomínky + da = Generel feedback + nl = Algemene Feedback + fi = Yleinen palaute + fr = Feedback général + de = Allgemeines Feedback + hu = Általános visszajelzés + id = Umpan Balik Umum + it = Feedback generale + ja = 一般的なフィードバック + ko = 일반 피드백 + nb = Generell tilbakemelding + pl = Ogólne uwagi + pt = Opinão geral + ro = Feedback general + es = Opinión general + sv = Allmän feedback + th = ข้อเสนอแนะทั่วไป + tr = Genel Geribildirim + uk = Загальний відгук + vi = Phản hồi chung + zh-Hans = 一般反馈 + zh-Hant = 一般反應 + el = Γενικό σχόλιο + sk = Všeobecné pripomienky + sw = Maoni Jumla [on] en = On ru = Вкл. + ar = تشغيل + cs = Zapnout + da = Til + nl = Aan + fi = Käytössä + fr = On + de = An + hu = Be + id = On + it = On + ja = オン + ko = 켜기 + nb = På + pl = Wł. + pt = Lig. + ro = Activat + es = Akt. + sv = På + th = เปิด + tr = Aç + uk = Увімкн. + vi = Bật + zh-Hans = 开 + zh-Hant = 開 + el = Ενεργ. + sk = Zap. + sw = Washa [off] en = Off ru = Выкл. + ar = إيقاف + cs = Vypnout + da = Fra + nl = Uit + fi = Ei käytössä + fr = Off + de = Aus + hu = Ki + id = Mati + it = Off + ja = オフ + ko = 끄기 + nb = Av + pl = Wył. + pt = Deslig. + ro = Dezactivat + es = Desact. + sv = Av + th = ปิด + tr = Kapat + uk = Вимкн. + vi = Tắt + zh-Hans = 关 + zh-Hant = 關 + el = Απενεργ. + sk = Vyp. + sw = Zima + + [prefs_languages_information] + en = We use system TTS for voice instructions. Many Android devices use Google TTS, you can download or update it from Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + ru = Подсказки озвучиваются системным ситнтезатором речи (TTS). На многих устройствах используется Google TTS, его можно загрузить или обновить в Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + ar = نحن نستخدم نظام النص إلى كلام (TTS) للتعليمات الصوتية. تستخدم العديد من أجهزة Android نظام Google TTS، يمكنك تنزيله من أو تحديثه من Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + cs = Pro hlasové pokyny používáme systém TTS. Mnoho zařízení se systémem Android používá Google TTS, můžete si ho stáhnout nebo aktualizovat na Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + da = Vi bruger systemets TTS til stemmevejledning. Mange Android-enheder bruger Google TTS, du kan hente eller opdatere det via Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + nl = We gebruiken het TTS-systeem voor gesproken instructies. Vele Android toestellen gebruiken Google TTS, u kunt het downloaden of bijwerken in Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + fi = Käytämme ääniohjeisiin tekstistä puheeksi -järjestelmää. Monet Android-laitteet käyttävät Googlen tekstistä puheeksi -sovellusta, jonka voit ladata tai päivittää Google Playssä (https://play.google.com/store/apps/details?id=com.google.android.tts) + fr = Nous utilisons le système TTS pour les instructions vocales. De nombreux appareils Android utilisent Google TTS, vous pouvez le télécharger ou le mettre à jour depuis Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + de = Wir verwenden Text-to-Speech-Systeme für Sprachanweisungen. Viele Android-Geräte nutzen Google-TTS, das können Sie bei Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) herunterladen oder aktualisieren. + hu = TTS rendszert használunk a hangnavigációhoz. Sok Android-os készülék használja a Google TTS-t; töltse le vagy frissítse a Google Play áruházból (https://play.google.com/store/apps/details?id=com.google.android.tts) + id = Kami menggunakan TTS sistem untuk petunjuk suara. Banyak perangkat Android menggunakan Google TTS, Anda dapat mengunduhnya dari Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + it = Usiamo il TTS di sistema per le istruzioni vocali. Molti dispositivi Android utilizzano Google TTS, che puoi scaricare o aggiornare da Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + ja = 音声案内にはシステムの TTS を使用します。多くの Android 端末が Google の TTS を使用しており、Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) からダウンロードや更新を行うことができます。 + ko = 당사는 음성 지침을 위해 시스템 TTS를 사용합니다. 많은 Android 장치에서 Google TTS를 사용합니다. Google Play(https://play.google.com/store/apps/details?id=com.google.android.tts)에서 Google TTS를 다운로드하거나 업데이트할 수 있습니다. + nb = Vi bruker system TTS for stemmeveiledning. Mange Android-enheter bruker Google TTS, Du kan laste ned eller oppdatere via Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + pl = Stosujemy system TTS dla komend głosowych. Stosuje go wiele urządzeń z systemem Android, można go pobrać lub zaktualizować z Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + pt = Utilizamos o sistema TTS para instruções de voz. Muitos dispositivos Android usam o Google TTS, pode transferir ou atualizá-lo a partir do Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + ro = Pentru instrucțiuni vocale utilizăm sistemul TTS. Multe dispozitive cu Android folosesc Google TTS. Puteți descărca sau actualiza aplicația din Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + es = Utilizamos el sistema TTS para las instrucciones de voz. Muchos dispositivos de Android usan Google TTS. Puede descargar o actualizarlo desde Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + sv = Vi använder TTS-system för röstinstruktioner. Flera Android-enheter använder Google TTS. Du kan ladda ned eller uppdatera det på Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + th = เราใช้ระบบ TTS สำหรับคำแนะนำด้วยเสียงพูด เครื่องแอนดรอยด์จำนวนมากใช้งาน Google TTS คุณสามารถดาวน์โหลดหรืออัปเดตได้จาก Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + tr = Sesli talimatlar için TTS sistemini kullanıyoruz. Çoğu Android cihaz, Google TTS'yi kullanıyor, Uygulamayı, Google Play'den indirebilir veya güncelleyebilirsiniz (https://play.google.com/store/apps/details?id=com.google.android.tts) + uk = Для озвучування голосових інструкцій ми використовуємо систему TTS. Більшість Android-пристроїв підтримують систему Google TTS. Для завантаження або оновлення перейдіть до магазину Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + vi = Chúng tôi sử dụng TTS hệ thống để hướng dẫn bằng giọng nói. Rất nhiều thiết bị Android sử dụng Google TTS, bạn có thể tải về hoặc cập nhật nó từ Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + zh-Hans = 我们为语音指令使用“文字转语音”系统。许多 Android 设备使用 Google 文字转语音，您可以从 Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) 下载或更新这一功能 + zh-Hant = 我們使用系統 TTS 提供語音指示。許多 Android 裝置使用 Google TTS，您可從 Google Play 下載或更新 (https://play.google.com/store/apps/details?id=com.google.android.tts) + el = Χρησιμοποιούμε σύστημα TTS για τις φωνητικές οδηγίες. Αρκετές συσκευές Android χρησιμοποιούν Google TTS, μπορείτε να το κατεβάσετε ή να το ενημερώσετε από το Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + sk = Na hlasové pokyny používame systém TTS. Mnohé zariadenia s Adroidom používajú Google TTS, ktorý si môžete stiahnuť alebo aktualizovať z obchodu Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + sw = Tunatumia maagizo ya sautii ya TTS ya mfumo. Vifaa vingi vya Android vinatumia Google TTS, unaweza kuipakua au kuisasisha kwenye Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) + + [prefs_languages_information_off] + en = For Arabic, Greek and Romanian languages you may need to install additional TTS (as Google TTS doesn’t support the languages yet) from Google Play like Vocalizer TTS or SVOX Classics.\nTo manage settings for speech synthesis, on your device open Settings –> Language and input –> Speech –> Text to speech output. Here you can download additional language pack or select preferred text-to-speech engine. + ru = Для арабского, греческого и румынского языков, возможно, необходимо установить дополнительный синтезатор речи (TTS) из Google Play, например, Vocalizer TTS or SVOX Classics, так как Google TTS пока не поддерживает эти языки. Чтобы настроить синтезатор речи, перейдите в Настройки -> Язык и ввод -> Синтез речи. Здесь можно установить допольнительные языковые пакеты или выбрать синтезатор речи. + ar = بالنسبة للغة العربية واليونانية والرومانية قد تحتاج إلى تثبيت نظام نص إلى كلام (TTS) إضافي (حيث إن نظام Google TTS لا يدعم اللغات بعد (من Google Play مثل Vocalizer TTS أو SVOX Classics.\nلإدارة الإعدادات لتخليق الكلام، في الجهاز الخاص بك افتح الإعدادات –> اللغة والإدخال –> الكلام –> إخراج نص إلى كلام. هنا يمكنك تنزيل حزمة لغة إضافية أو تحديد محرك النص إلى كلام المفضل. + cs = Pro arabštinu, řečtinu a rumunštinu budete muset nainstalovat další TTS (protože Google TTS zatím nepodporuje tyto jazyky) ze služby Google Play, např. Vocalizer TTS nebo SVOX Classics. \nChcete-li spravovat nastavení pro syntézu řeči, na svém zařízení otevřete Nastavení –> Jazyk a vstupy –> Mluvené slovo –> Převod textu na mluvené slovo. Zde si můžete stáhnout další balík jazyků nebo vybrat preferovaný nástroj pro převod textu na mluvené slovo. + da = I forbindelse med sprogene arabisk, græsk og rumænsk skal du installere yderligere TTS såsom som Vocalizer TTS eller SVOX Classics fra Google Play (eftersom Google TTS ikke understøtter disse sprog endnu). Hvis du vil administrere indstillinger for talesyntese på enheden, skal du åbne Indstillinger –> Sprog og input –> Tale –> Tekst til tale-output. Her kan du downloade yderligere sprogpakker eller vælge dit foretrukne tekst til tale-program. + nl = Voor Arabische, Griekse en Roemeense talen dient u mogelijk aanvullende TTS te installeren (aangezien Google TTS de talen nog niet ondersteunt) in Google Play, zoals Vocalizer TTS of SVOX Classics.\nOm instellingen voor spraaksynthese te beheren, open op uw toestel Instellingen -> Taal en invoer -> Spraak -> Uitvoer voor tekst-naar-spraak. Hier kunt u aanvullende taalpakketten downloaden of de tekst-naar-spraak engine van uw voorkeur selecteren. + fi = Arabian, kreikan ja romanian kieliä varten sinun täytyy mahdollisesti asentaa ylimääräinen tekstistä puheeksi -järjestelmä Google Playstä (koska Googlen tekstistä puheeksi -sovellus ei vielä tue näitä kieliä), kuten Vocalizer TTS tai SVOX Classic. Voit hallita tekstistä puheeksi -ominaisuuden asetuksia laitteellasi kohdassa Asetukset –> Kieli ja syöttötapa –> Puhe –> Tekstistä puheeksi -toisto. Täällä voit ladata uusia kielipaketteja tai valita haluamasi tekstistä puheeksi -ohjelman. + fr = Pour les langues arabe, grecque et roumaine, Il vous faudra peut-être installer un TTS supplémentaire (car Google TTS n'est pas encore compatible avec ces langues) depuis Google Play tel que Vocalizer TTS ou SVOX Classics. Pour gérer les paramètres de synthèse vocale, ouvrez sur votre appareil Paramètres –> Langue et entrée – > Parole – > Texte en parole. Vous pouvez télécharger ici un package de langues supplémentaires ou sélectionner votre logiciel de synthèse vocale préféré. + de = Für Arabisch, Griechisch und Rumänisch müssen Sie möglicherweise zusätzliche TTS-Systeme von Google Play herunterladen und installieren (denn Google-TTS unterstützt diese Sprachen bisher noch nicht), Sie können zum Beispiel Vocalizer TTS oder SVOX Classics verwenden. Um die Einstellungen für Sprachsynthese zu verwalten, gehen Sie auf Ihrem Gerät zu Einstellungen -> Sprache und Eingabe -> Sprache -> Text-to-Speech-Ausgabe. Hier können Sie zusätzliche Sprachpakete herunterladen oder das bevorzugte Versprachlichungsprogramm auswählen. + hu = Arab, görög és román nyelven szükség lehet arra, hogy további TTS-t telepítsen Google Play áruházból (mivel a Google TTS még nem támogatja a nyelveket), mint például a Vocalizer TTS-t vagy a SVOX Classics alkalmazást. \nBeszédszintézis beállításainak kezeléséhez nyissa meg készülékén a következőket: Beállítások–> Nyelv és adatbevitel-–>Beszéd –> Szöveg-beszéd átalakítás kimenet. Itt további nyelvi csomagokat tölthet le, kiválaszthatja a kívánt szöveg-beszéd motort. + id = Untuk bahasa Arab, Yunani, dan Romania, Anda mungkin perlu menginstal TTS tambahan (karena Google TTS belum mendukung bahasa-bahasa ini) dari Google Play, seperti Vocalizer TTS atau SVOX Classics.\nUntuk mengelola pengaturan untuk sintesis suara, pada perangkat Anda buka Settings (Pengaturan) –> Language and input (Bahasa dan input) –> Speech (Tuturan) –> Text to speech output (Output teks ke tuturan). Di sini Anda dapat mengunduh paket bahasa tambahan atau memilih mesin teks ke tuturan yang diinginkan. + it = Per l'arabo, il greco e il rumeno, potrebbe essere necessario installare un servizio TTS aggiuntivo (poiché Google TTS non supporta ancora queste lingue) da Google Play, ad esempio Vocalizer TTS o SVOX Classics.\nPer gestire le impostazioni di sintesi vocale, dal tuo dispositivo apri Impostazioni –> Lingua e input –> Riconoscimento vocale –> Output sintesi vocale. Qui puoi scaricare il language pack aggiuntivo o selezionare il tuo motore di sintesi vocale preferito. + ja = アラビア語、ギリシャ語、ルーマニア語では Vocalizer TTS や SVOX Classics のような追加の TTS を Google Play からインストールする必要があるかもしれません（Google TTS がまだこれらの言語をサポートしていないため）。\n音声合成の設定を管理するには、お使いのデバイスで [設定] –> [言語と入力] –> [音声] –> [テキスト読み上げの出力] を開きます。こここで追加の言語パックをダウンロードしたり、お好みの音声合成エンジンを選択することができます。 + ko = 아랍어, 그리스어 및 루마니아어의 경우 Google Play에서 Vocalizer TTS 또는 SVOX Classic 같은 추가적인 TTS(Google TTS는 해당 언어를 아직 지원하지 않음)를 설치해야 할 수 있습니다.\n음성 합성에 대한 설정을 관리하려면 장치에서 설정 -> 언어 및 입력 -> 음성 -> 음성으로 읽어주기 설정을 엽니다. 여기에서 추가적인 언어 팩을 다운로드하거나 기본 음성으로 읽어주기 엔진을 선택할 수 있습니다. + nb = Du må installere ekstra TTS for arabisk, gresk og rumensk (siden Google TTS ikke støtter språkene ennå) fra Google Play, som for eksempel Vocalizer TTS eller SVOX Classics.\nFor å behandle innstillinger for talesyntese, gå til Innstillinger -> Språk og inndata -> Tale-> Tekst til tale. Her kan du laste ned flere språkpakker eller velg foretrukket tekst til tale-motor. + pl = Do obsługi języka arabskiego, greckiego i rumuńskiego koniecznie może być zainstalowanie dodatkowych systemów TTS (Google TTS nie obsługuje obecnie tych języków) z Google Play, takich jak Vocalizer TTS lub SVOX Classics. Aby zarządzać ustawieniami dla syntezy mowy, na swoim urządzeniu otwórz Ustawienia –> Język i wprowadzanie – > Mowa – > Wyjście tekstu na mowę. Tutaj można pobrać dodatkowe pakiety językowe lub wybrać preferowane silniki konwersji tekstu na mowę. + pt = Para os idiomas árabe, grego e romeno: é possível que tenha de instalar TTS adicionais (uma vez que o Google TTS ainda não inclui estes idiomas) a partir do Google Play, como o Vocalizer TTS ou o SVOX Classics. Para gerir as configurações de síntese de fala, no seu dispositivo, vá a Configurações – > idioma e entrada – > voz – > saída de texto para voz. Aqui pode transferir um pacote de idioma adicional ou selecionar um motor de texto para voz. + ro = Pentru limbile arabă, greacă și română ar putea fi necesar să instalați alte aplicații TTS (deoarece Google TTS nu oferă încă suport pentru aceste limbi) din Google Play, ca de exemplu Vocalizer TTS sau SVOX Classics.\nPentru setarea sintetizatorului vocal, deschideți pe dispozitiv Setări –> Limbă și introducere –> Voce –> Text. De aici puteți descărca pachete de limbi suplimentare sau selecta motorul preferat de transcriere vocală. + es = Para los idiomas árabe, griego y rumano, es posible que necesite instalar un TTS adicional (puesto que Google TTS aún no incluye estos idiomas) desde Google Play, como Vocalizer TTS o SVOX Classics.\nPara administrar los ajustes de síntesis del habla, abra los Ajustes de su dispositivo –> Idioma e introducción –> Voz –> Opciones texto a voz. En este menú puede descargar un paquete de idioma especial o seleccionar un motor existente de conversión de texto a voz. + sv = För arabiska, grekiska och rumänska måste du kanske installera ytterligare TTS (eftersom Google TTS inte stödjer dessa språk ännu) från Google Play, som till exempel Vocalizer TTS eller SVOX Classics.\nFör att hantera talsyntesinställningar på din enhet, öppna Inställningar –> Språk och inmatning –> Tal –> Text till tal-uppspelning. Här kan du ladda ned flera språkpaket eller välja den text till tal-motor som du föredrar. + th = สำหรับภาษาอาหรับ กรีก และโรมาเนีย คุณอาจจำเป็นต้องติดตั้ง TTS (เนื่องจาก Google TTS ยังไม่ได้รองรับภาษาเหล่านี้) เพิ่มเติมจาก Google Play อย่างเช่น Vocalizer TTS หรือ SVOX Classics\nในการที่จะจัดการการตั้งค่าสำหรับการสังเคราะห์เสียงพูด เปิด การตั้งค่า –> ภาษาและอินพุต –> เสียงพูด –> เอาท์พุตการแปลงข้อความไปเป็นเสียงพูด บนเครื่องของคุณ ซึ่งคุณสามารถดาวน์โหลดชุดภาษาเพิ่มเติมหรือเลือกเอนจินการแปลงข้อความไปเป็นเสียงพูดที่ชอบได้ + tr = Arapça, Yunanca ve Rumence dilleri için Google Play'den Vocalizer TTS veya SVOX Classics gibi ek TTS (Google TTS, henüz bu dilleri desteklememektedir) uygulamalarını yüklemeniz gerekebilir. Ses sentezi ayarlarını yönetmek için cihazınızda Ayarlar -> Dil ve giriş -> Konuşma -> Konuşmayı metne dönüştür seçeneklerini etkinleştirin. Buradan, ek dil paketini indirebilir veya tercih ettiğiniz metin okuma motorunu seçebilirsiniz. + uk = Для арабської, грецької та румунської мов можливо вам знадобиться встановити додаткову систему TTS (наразі Google TTS не підтримує ці мови) з магазину Google Play — наприклад, Vocalizer TTS або SVOX Classics.\nДля управління налаштуваннями синтезу мови відкрийте на вашому пристрої Налаштування –> Мова та введення –> Мовлення –> Перетворення тексту на мовлення. Тут ви можете завантажити додатковий мовний пакет або вибрати інструмент для перетворення тексту на мовлення. + vi = Đối với tiếng Ả Rập, tiếng Hy Lạp và tiếng Rumani, bạn có thể cần cài đặt thêm TTS (bởi Google TTS chưa hỗ trợ các ngôn ngữ này) từ Google Play như Vocalizer TTS hoặc SVOX Classics.\nĐể quản lý các thiết lập tổng hợp giọng nói, trên thiết bị của bạn mở Cài đặt –> Ngôn ngữ và nhập liệu –> Giọng nói –> Đầu ra văn bản thành giọng nói. Ở đây bạn có thể tải về thêm các gói ngôn ngữ và lựa chọn công cụ chuyển văn bản thành giọng nói ưa thích. + zh-Hans = 对于阿拉伯语、希腊语和罗马尼亚语，您需要从 Google Play 中安装其他“文字转语音”功能（因为 Google 文字转语音不支持这些语言），例如 Vocalizer TTS 或 SVOX Classics。\n要管理语音合成的设置，请在您的设备上打开“设置 –> 语言和输入法 –> 语音 –> 文字转语音 (TTS) 输出”。您可以从这里下载其他语言包或选择首先的文字转语音引擎。 + zh-Hant = 對於阿拉伯語、希臘語或羅馬尼亞語，必須從 Google Play 下載 Vocalizer TTS 或 SVOX Classics 等其他 TTS (因為 Google TTS 尚未支援這些語言)。\n若要管理語音合成的設定，請在您的裝置上開啟「設定 –> 語言和輸入 –> 語音 –> 文字轉語音輸出」。您可在此下載其他語言套件，或選擇偏好的文字轉語音引擎。 + el = Για Αραβικά, Ελληνικά και Ρουμανικά ίσως χρειάζεται να εγκαταστήσετε συμπληρωματικό TTS (δεδομένου ότι το Google TTS δεν υποστηρίζει τις συγκεκριμένες γλώσσες προς το παρόν) από το Google Play όπως το Vocalizer TTS ή το SVOX Classics. \nΓια να αλλάξετε τις ρυθμίσεις της σύνθεσης ομιλίας, στη συσκευή σας ανοίξτε το μενού Ρυθμίσεις – > Γλώσσα και εισαγωγή – > Ομιλία – > Μετατροπή κειμένου σε ομιλία. Εδώ μπορείτε να κατεβάσετε συμπληρωματικά πακέτα γλώσσας ή να επιλέξετε τη μηχανή μετατροπής κειμένου σε ομιλία που προτιμάτε. + sk = Pre arabčinu, gréčtinu a rumunčinu bude potrebné z obchodu Google Play nainštalovať dodatočné TTS (keďže Google tieto jazyky ešte nepodporuje) ako Vocalizer TTS alebo SVOX Classics. Ak chcete nastaviť nastavenia na syntézu reči, otvorte v zariadení Nastavenia -> Jazyk a vstup -> Reč -> Výstup textu na reč. Tam si môžete prevziať dodatočný jazykový balík alebo si vybrať preferovaný systém prevodu textu na reč. + sw = Kwa lugha za Kiarabu, Kigiriki na Kiromania huenda ukahitajika kusakinisha TTS ya ziada (kwani Google TTS bado haina lugha hizi) kwenye Google Play kama vile Vocalizer TTS au SVOX Classics.\nIli kudhibiti mipangilio ya usanidi wa usemi, kwenye kifaa chako fungua Mipangilio –> Lugha na Ingizo –> Usemi –> Tokeo la kugeuza maandishi kuwa usemi. Hapa unaweza kupakua furushi za ziada za lugha au uchague injini inayopendelea ya kugeuza maandishi kuwa usemi. + + [prefs_languages_information_off_link] + en = For more information please check this guide. + ru = Более подробная информация — в этом руководстве. + ar = لمزيد من المعلومات الرجاء مراجعة هذا الدليل. + cs = Více informací najdete v tomto návodu. + da = Se denne vejledning for flere oplysninger. + nl = Gelieve deze handleiding te lezen voor meer informatie. + fi = Lisätietoja saat tästä oppaasta. + fr = Pour plus d’informations, veuillez consulter ce guide. + de = Weitere Informationen finden Sie in dieser Anleitung. + hu = További tájékoztatást találhat még ebben az útmutatóban. + id = Untuk informasi selengkapnya, bacalah panduan ini. + it = Per maggiori informazioni, consulta questa guida. + ja = 詳細については、このガイドをご確認ください。 + ko = 자세한 내용을 보려면 이 가이드를 확인하세요. + nb = Les denne veiledningen for mer informasjon. + pl = Aby uzyskać więcej informacji, sprawdź ten poradnik. + pt = Para obter mais informações, consulte este guia. + ro = Consultați acest ghid pentru informații suplimentare. + es = Para obtener más información, consulte esta guía. + sv = Kolla in den här guiden för mer information. + th = สำหรับข้อมูลเพิ่มเติม กรุณาเข้าชมคำแนะนำนี้ + tr = Daha fazla bilgi için lütfen bu kılavuzu inceleyin. + uk = Додаткову інформацію див. у цьому керівництві. + vi = Để biết thêm thông tin, vui lòng kiểm tra bài hướng dẫn này. + zh-Hans = 如需了解更多信息，请查阅此指南。 + zh-Hant = 如需更多資訊，請參閱本指南。 + el = Για περισσότερες πληροφορίες δείτε αυτό τον οδηγό. + sk = Viac informácií nájdete v tomto návode. + sw = Kwa maelezo zaidi tafadhali tazama mwongozo huu. + + [whatsnew_transliteration_title] + en = Transliteration into Latin + ru = Латинская транслитерация + ar = كتابة بالحروف اللاتينية + cs = Transliterace do latinky + da = Translitteration til latinsk + nl = Transliteratie in het Latijn + fi = Translitterointi latinaksi + fr = Translittération en latin + de = Transliteration ins Lateinische + hu = Átírás latin nyelvre + id = Transliterasi ke dalam bahasa Latin + it = Traslitterazione in latino + ja = ラテン文字への字訳 + ko = 라틴어로 음역 + nb = Omskrivning til latin + pl = Transkrypcja na alfabet łaciński + pt = Transliteração para o latim + ro = Transcriere în alfabet latin + es = Transliteración al alfabeto latino + sv = Transkribering till latin + th = การทับศัพท์เป็นภาษาละติน + tr = Latince alfabesine çevirme + uk = Транслітерація латинськими літерами + vi = Chuyển ngữ sang chữ Latinh + zh-Hans = 直译成拉丁文 + zh-Hant = 音譯為拉丁文 + af = Transliterasie na Latynse alfabet + be = Транслітарацыя лацінкай + el = Μεταγραφή στα Λατινικά + es_MX = Transliteración al alfabeto latino + fr_CA = Translittération vers l'alphabet latin + he = תעתיק ללטינית + hi = लैटिन में लिप्यंतरण + ms = Transliterasi kepada Latin + pt_BR = Transliteração para alfabeto latino + sk = Prepis do latinčiny + sw = Tafsiri kwa lugha ya Kilatini + + [whatsnew_transliteration_message] + en = If a street or an object doesn't have a name in your language, it will be spelt using the Latin alphabet. + ru = Если у улицы или объекта нет названия на вашем языке, то мы покажем его латиницей. + ar = إذا كان الشارع أو الهدف ليس له اسم بلغتك. فسيتم هجاؤه بالحروف اللاتينية. + cs = Pokud ulice nebo objekt nemá název ve vašem jazyce, bude zobrazeno latinkou. + da = Hvis en gade eller et objekt ikke har et navn på dit sprog, vil det blive stavet ved hjælp af det latinske alfabet. + nl = Indien een straat of object geen naam heeft in uw taal, wordt deze gespeld door gebruik van het Latijns alfabet. + fi = Jos kadulla tai kohteella ei ole nimeä kielelläsi, se kirjoitetetaan latinalaisilla kirjaimilla. + fr = Si une rue ou un objet n’a pas de nom dans votre langue, l’alphabet latin sera utilisé pour l'écrire. + de = Wenn eine Straße oder ein Objekt in Ihrer Sprache keinen Namen hat, wird er mit lateinischen Buchstaben geschrieben. + hu = Ha egy utcának vagy egy objektumnak nincs neve az Ön nyelvén, latin ábécével kerül átírásra. + id = Jika jalan atau objek tidak memiliki nama dalam bahasa Anda, namanya akan dieja menggunakan alfabet Latin. + it = Se una strada o un oggetto non ha un nome nella tua lingua, tale nome sarà scritto utilizzando l'alfabeto latino. + ja = 通り名や物件名をあなたの言語で表示できない場合、ラテン文字のアルファベットで綴られます。 + ko = 거리 또는 개체에 사용자 언어로 된 이름이 없는 경우, 라틴 알파벳을 사용하여 나옵니다. + nb = Hvis en gate eller et element ikke har et navn på ditt språk, vil det bli skrevet med det latinske alfabetet. + pl = Jeśli dana ulica lub obiekt nie posiada nazwy w twoim języku, ich nazwa zapisana zostanie w alfabecie łacińskim. + pt = Se uma rua ou um objeto não tiver nome na sua língua, será utilizado o alfabeto latino. + ro = Dacă o stradă sau un obiect nu are un nume în limba dvs., va fi exprimat utilizând alfabetul latin. + es = Si una calle o un objeto no tiene nombre en su idioma, se escribirá con el alfabeto latino. + sv = Om en gata eller ett objekt saknar ett namn på ditt språk kommer det att stavas med det latinska alfabetet. + th = หากถนนหรือเป้าหมายไม่มีชื่อในภาษาของคุณก็จะสะกดโดยใช้ตัวอักษรละติน + tr = Bir caddenin veya bir nesnenin adının kendi dilinizde mevcut olmaması durumunda, Latin alfabesi kullanılarak yazılır. + uk = Якщо для вулиці чи об\\'єкта відсутня назва українською мовою, використовуватиметься назва, транслітерована латинськими літерами. + vi = Nếu một đường phố hoặc đối tượng không có tên trong ngôn ngữ của bạn, nó sẽ được đánh vần sử dụng bảng chữ cái alphabet. + zh-Hans = 如果某条街道或者某个对象在您的语言中没有对应的名称，它将使用拉丁字母拼写。 + zh-Hant = 若街道或物件沒有您語言的名稱，會使用拉丁字母拼出。 + af = As 'n straat of objek nie 'n naam in u taal het nie, sal dit geskryf word in die Latynse alfabet. + be = Калі назвы вуліцы ці аб’екта на вашай мове няма, яны будуць запісвацца лацінскім алфавітам. + el = Εάν ένας δρόμος ή ένα αντικείμενο δεν έχει όνομα στη γλώσσα σας, θα διατυπωθεί χρησιμοποιώντας το λατινικό αλφάβητο. + es_MX = Si una calle o un objeto no tienen nombre en su idioma, se escribirá con el alfabeto latino. + fr_CA = Si une rue ou un objet ne possède pas de nom dans votre langue, il apparaîtra toujours en alphabet latin. + he = אם אין לרחוב או לאובייקט אחר שם בשפה שלך, הוא יתועתק באמצעות אותיות לטיניות. + hi = यदि किसी गली, मुहल्ले या किसी अन्य चीज़ का आपकी भाषा में कोई नाम न हो तो यह लैटिन वर्णमाला का प्रयोग करते हुए उच्चारित होगा। + ms = Jika objek atau jalan yang tidak mempunyai nama dalam bahasa anda, ia akan dieja menggunakan huruf Rumi. + pt_BR = Se uma rua ou um objeto não possui um nome em seu idioma, ele será soletrado usando o alfabeto latino. + sk = Ak ulica alebo objekt nemá názov vo vašom jazyku, prepíše sa tento názov latinkou. + sw = Ikiwa mtaa au kipengee hakina jina kwa lugha yako, kitaandikwa kwa herufi za alfabeti ya Kilatini. diff --git a/tools/python/generate_local_ads_symbols.py b/tools/python/generate_local_ads_symbols.py index 1aab9048dc..31f39485d4 100755 --- a/tools/python/generate_local_ads_symbols.py +++ b/tools/python/generate_local_ads_symbols.py @@ -59,4 +59,4 @@ if __name__ == '__main__': check_symbols(symbols) with open(output_name, "w") as text_file: for symbol in symbols: - text_file.write(symbol) + text_file.write(symbol + '\n') diff --git a/tools/unix/generate_symbols.sh b/tools/unix/generate_symbols.sh index 70a333b16c..ce2305d6c8 100755 --- a/tools/unix/generate_symbols.sh +++ b/tools/unix/generate_symbols.sh @@ -96,17 +96,17 @@ BuildSkin clear clear xhdpi 36 false _clear symbols BuildSkin clear clear xxhdpi 54 false _clear symbols BuildSkin clear clear 6plus 54 false _clear symbols -BuildSkin clear night mdpi 18 false _dark symbols-ad -ad -BuildSkin clear night hdpi 27 false _dark symbols-ad -ad -BuildSkin clear night xhdpi 36 false _dark symbols-ad -ad -BuildSkin clear night xxhdpi 54 false _dark symbols-ad -ad -BuildSkin clear night 6plus 54 false _dark symbols-ad -ad +BuildSkin clear night mdpi 22 false _dark symbols-ad -ad +BuildSkin clear night hdpi 34 false _dark symbols-ad -ad +BuildSkin clear night xhdpi 44 false _dark symbols-ad -ad +BuildSkin clear night xxhdpi 68 false _dark symbols-ad -ad +BuildSkin clear night 6plus 68 false _dark symbols-ad -ad -BuildSkin clear clear mdpi 18 false _clear symbols-ad -ad -BuildSkin clear clear hdpi 27 false _clear symbols-ad -ad -BuildSkin clear clear xhdpi 36 false _clear symbols-ad -ad -BuildSkin clear clear xxhdpi 54 false _clear symbols-ad -ad -BuildSkin clear clear 6plus 54 false _clear symbols-ad -ad +BuildSkin clear clear mdpi 22 false _clear symbols-ad -ad +BuildSkin clear clear hdpi 34 false _clear symbols-ad -ad +BuildSkin clear clear xhdpi 44 false _clear symbols-ad -ad +BuildSkin clear clear xxhdpi 68 false _clear symbols-ad -ad +BuildSkin clear clear 6plus 68 false _clear symbols-ad -ad echo "Generate local ads symbols" python "$LOCAL_ADS_SYMBOLS_GENERATOR" "$DATA_PATH/styles" "$DATA_PATH" diff --git a/xcode/common.xcconfig b/xcode/common.xcconfig index 152a64071a..2dee126d88 100644 --- a/xcode/common.xcconfig +++ b/xcode/common.xcconfig @@ -1,4 +1,4 @@ -CURRENT_PROJECT_VERSION = 7.2.4 +CURRENT_PROJECT_VERSION = 7.3.3 // Paths OMIM_ROOT = $(PROJECT_DIR)/../.. diff --git a/xcode/platform/platform.xcodeproj/project.pbxproj b/xcode/platform/platform.xcodeproj/project.pbxproj index 84729dc48b..2d2404f72f 100644 --- a/xcode/platform/platform.xcodeproj/project.pbxproj +++ b/xcode/platform/platform.xcodeproj/project.pbxproj @@ -89,7 +89,6 @@ 678338A81C6DE5E300FD6263 /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 675343781A3F5CF500A0A8C3 /* libplatform.a */; }; 678338AD1C6DF51D00FD6263 /* classificator.txt in Resources */ = {isa = PBXBuildFile; fileRef = 678338AB1C6DF50700FD6263 /* classificator.txt */; }; 678338AE1C6DF51D00FD6263 /* minsk-pass.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 678338AC1C6DF50700FD6263 /* minsk-pass.mwm */; }; - 678338AF1C6DF51D00FD6263 /* resources-ldpi_legacy in Resources */ = {isa = PBXBuildFile; fileRef = 678338AA1C6DF4F200FD6263 /* resources-ldpi_legacy */; }; 678338B21C6E016F00FD6263 /* WorldCoasts.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 678338B11C6E016700FD6263 /* WorldCoasts.mwm */; }; 678338B31C6E017200FD6263 /* World.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 678338B01C6E016700FD6263 /* World.mwm */; }; 67A2526A1BB40E100063F8A8 /* platform_qt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753439C1A3F5D5A00A0A8C3 /* platform_qt.cpp */; }; @@ -98,6 +97,11 @@ 67AB92DD1B7B3D7300AB5194 /* mwm_version.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67AB92DB1B7B3D7300AB5194 /* mwm_version.hpp */; }; 67AB92EA1B7B3E9100AB5194 /* get_text_by_id.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67AB92E81B7B3E9100AB5194 /* get_text_by_id.cpp */; }; 67AB92EB1B7B3E9100AB5194 /* get_text_by_id.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67AB92E91B7B3E9100AB5194 /* get_text_by_id.hpp */; }; + F6DF73581EC9EAE700D8BA0B /* string_storage_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6DF73561EC9EAE700D8BA0B /* string_storage_base.cpp */; }; + F6DF73591EC9EAE700D8BA0B /* string_storage_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6DF73561EC9EAE700D8BA0B /* string_storage_base.cpp */; }; + F6DF735A1EC9EAE700D8BA0B /* string_storage_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6DF73561EC9EAE700D8BA0B /* string_storage_base.cpp */; }; + F6DF735B1EC9EAE700D8BA0B /* string_storage_base.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F6DF73571EC9EAE700D8BA0B /* string_storage_base.hpp */; }; + F6DF735C1EC9EAE700D8BA0B /* string_storage_base.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F6DF73571EC9EAE700D8BA0B /* string_storage_base.hpp */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -197,6 +201,8 @@ 67AB92DB1B7B3D7300AB5194 /* mwm_version.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mwm_version.hpp; sourceTree = ""; }; 67AB92E81B7B3E9100AB5194 /* get_text_by_id.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = get_text_by_id.cpp; sourceTree = ""; }; 67AB92E91B7B3E9100AB5194 /* get_text_by_id.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = get_text_by_id.hpp; sourceTree = ""; }; + F6DF73561EC9EAE700D8BA0B /* string_storage_base.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = string_storage_base.cpp; sourceTree = ""; }; + F6DF73571EC9EAE700D8BA0B /* string_storage_base.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = string_storage_base.hpp; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -372,6 +378,8 @@ 675343A71A3F5D5A00A0A8C3 /* servers_list.hpp */, 675343A81A3F5D5A00A0A8C3 /* settings.cpp */, 675343A91A3F5D5A00A0A8C3 /* settings.hpp */, + F6DF73561EC9EAE700D8BA0B /* string_storage_base.cpp */, + F6DF73571EC9EAE700D8BA0B /* string_storage_base.hpp */, 675343AE1A3F5D5A00A0A8C3 /* wifi_info_windows.cpp */, 675343AF1A3F5D5A00A0A8C3 /* wifi_info.hpp */, 675343B01A3F5D5A00A0A8C3 /* wifi_location_service.cpp */, @@ -403,6 +411,7 @@ files = ( 675341271C58C61D002CF0D9 /* scoped_dir.hpp in Headers */, 675341281C58C61D002CF0D9 /* scoped_mwm.hpp in Headers */, + F6DF735C1EC9EAE700D8BA0B /* string_storage_base.hpp in Headers */, 675341261C58C616002CF0D9 /* scoped_file.hpp in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -437,6 +446,7 @@ 675343CF1A3F5D5A00A0A8C3 /* preferred_languages.hpp in Headers */, 3D30587D1D8320E4004AC712 /* http_client.hpp in Headers */, 56EB1EDD1C6B6E6C0022D831 /* file_logging.hpp in Headers */, + F6DF735B1EC9EAE700D8BA0B /* string_storage_base.hpp in Headers */, 6741250D1B4C00CC00A3E828 /* local_country_file_utils.hpp in Headers */, 675343DA1A3F5D5A00A0A8C3 /* wifi_info.hpp in Headers */, 671C62071AE9014C00076BD0 /* measurement_utils.hpp in Headers */, @@ -545,7 +555,6 @@ 678338AD1C6DF51D00FD6263 /* classificator.txt in Resources */, 678338AE1C6DF51D00FD6263 /* minsk-pass.mwm in Resources */, 671182F31C80AC4200CB8177 /* WorldCoasts_obsolete.mwm in Resources */, - 678338AF1C6DF51D00FD6263 /* resources-ldpi_legacy in Resources */, 678338B21C6E016F00FD6263 /* WorldCoasts.mwm in Resources */, 678338B31C6E017200FD6263 /* World.mwm in Resources */, ); @@ -559,6 +568,7 @@ buildActionMask = 2147483647; files = ( 675341251C58C60F002CF0D9 /* scoped_mwm.cpp in Sources */, + F6DF73591EC9EAE700D8BA0B /* string_storage_base.cpp in Sources */, 675341231C58C60F002CF0D9 /* scoped_dir.cpp in Sources */, 675341241C58C60F002CF0D9 /* scoped_file.cpp in Sources */, ); @@ -581,6 +591,7 @@ 675343D91A3F5D5A00A0A8C3 /* wifi_info_windows.cpp in Sources */, 56EB1EDE1C6B6E6C0022D831 /* mwm_traits.cpp in Sources */, 3D30587F1D880910004AC712 /* http_client_apple.mm in Sources */, + F6DF73581EC9EAE700D8BA0B /* string_storage_base.cpp in Sources */, 67247FFD1C60BD6500EDE56A /* writable_dir_changer.cpp in Sources */, 34513AFB1DCB37C100471BDA /* marketing_service.cpp in Sources */, 6741250C1B4C00CC00A3E828 /* local_country_file_utils.cpp in Sources */, @@ -615,6 +626,7 @@ 6783389D1C6DE59200FD6263 /* measurement_tests.cpp in Sources */, 678338971C6DE59200FD6263 /* country_file_tests.cpp in Sources */, 678338951C6DE59200FD6263 /* testingmain.cpp in Sources */, + F6DF735A1EC9EAE700D8BA0B /* string_storage_base.cpp in Sources */, 6783389B1C6DE59200FD6263 /* local_country_file_tests.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/xcode/routing/routing.xcodeproj/project.pbxproj b/xcode/routing/routing.xcodeproj/project.pbxproj index 8653ae4be8..b8d03562e8 100644 --- a/xcode/routing/routing.xcodeproj/project.pbxproj +++ b/xcode/routing/routing.xcodeproj/project.pbxproj @@ -63,6 +63,11 @@ 56555E591D897D28009D786D /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6742ACDE1C68A13F009CB89E /* testingmain.cpp */; }; 56826BD01DB51C4E00807C62 /* car_router.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56826BCE1DB51C4E00807C62 /* car_router.cpp */; }; 56826BD11DB51C4E00807C62 /* car_router.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56826BCF1DB51C4E00807C62 /* car_router.hpp */; }; + 5694CECA1EBA25F7004576D3 /* road_access_serialization.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5694CEC51EBA25F7004576D3 /* road_access_serialization.cpp */; }; + 5694CECB1EBA25F7004576D3 /* road_access_serialization.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 5694CEC61EBA25F7004576D3 /* road_access_serialization.hpp */; }; + 5694CECC1EBA25F7004576D3 /* road_access.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5694CEC71EBA25F7004576D3 /* road_access.cpp */; }; + 5694CECD1EBA25F7004576D3 /* road_access.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 5694CEC81EBA25F7004576D3 /* road_access.hpp */; }; + 5694CECE1EBA25F7004576D3 /* vehicle_mask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5694CEC91EBA25F7004576D3 /* vehicle_mask.cpp */; }; 56C439281E93BF8C00998E29 /* cross_mwm_graph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C439241E93BF8C00998E29 /* cross_mwm_graph.cpp */; }; 56C439291E93BF8C00998E29 /* cross_mwm_graph.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56C439251E93BF8C00998E29 /* cross_mwm_graph.hpp */; }; 56C4392A1E93BF8C00998E29 /* cross_mwm_osrm_graph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C439261E93BF8C00998E29 /* cross_mwm_osrm_graph.cpp */; }; @@ -319,6 +324,11 @@ 56099E321CC9247E00A7772A /* directions_engine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = directions_engine.cpp; sourceTree = ""; }; 56826BCE1DB51C4E00807C62 /* car_router.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = car_router.cpp; sourceTree = ""; }; 56826BCF1DB51C4E00807C62 /* car_router.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = car_router.hpp; sourceTree = ""; }; + 5694CEC51EBA25F7004576D3 /* road_access_serialization.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = road_access_serialization.cpp; sourceTree = ""; }; + 5694CEC61EBA25F7004576D3 /* road_access_serialization.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = road_access_serialization.hpp; sourceTree = ""; }; + 5694CEC71EBA25F7004576D3 /* road_access.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = road_access.cpp; sourceTree = ""; }; + 5694CEC81EBA25F7004576D3 /* road_access.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = road_access.hpp; sourceTree = ""; }; + 5694CEC91EBA25F7004576D3 /* vehicle_mask.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vehicle_mask.cpp; sourceTree = ""; }; 56C439241E93BF8C00998E29 /* cross_mwm_graph.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cross_mwm_graph.cpp; sourceTree = ""; }; 56C439251E93BF8C00998E29 /* cross_mwm_graph.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cross_mwm_graph.hpp; sourceTree = ""; }; 56C439261E93BF8C00998E29 /* cross_mwm_osrm_graph.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cross_mwm_osrm_graph.cpp; sourceTree = ""; }; @@ -718,6 +728,11 @@ 675343FA1A3F640D00A0A8C3 /* routing */ = { isa = PBXGroup; children = ( + 5694CEC51EBA25F7004576D3 /* road_access_serialization.cpp */, + 5694CEC61EBA25F7004576D3 /* road_access_serialization.hpp */, + 5694CEC71EBA25F7004576D3 /* road_access.cpp */, + 5694CEC81EBA25F7004576D3 /* road_access.hpp */, + 5694CEC91EBA25F7004576D3 /* vehicle_mask.cpp */, 56C4392C1E93E5DF00998E29 /* transition_points.hpp */, 56C439241E93BF8C00998E29 /* cross_mwm_graph.cpp */, 56C439251E93BF8C00998E29 /* cross_mwm_graph.hpp */, @@ -901,6 +916,7 @@ 0C5FEC6A1DDE193F0017688C /* road_index.hpp in Headers */, 674F9BCD1B0A580E00704FFA /* features_road_graph.hpp in Headers */, 670EE5741B664796001E8064 /* pedestrian_directions.hpp in Headers */, + 5694CECB1EBA25F7004576D3 /* road_access_serialization.hpp in Headers */, 0C08AA371DF8324D004195DD /* vehicle_mask.hpp in Headers */, 6753441D1A3F644F00A0A8C3 /* router.hpp in Headers */, A1616E2E1B6B60B3003F078E /* astar_progress.hpp in Headers */, @@ -915,6 +931,7 @@ 0C090C881E4E276700D52AFD /* world_graph.hpp in Headers */, 56099E2F1CC8FBDA00A7772A /* osrm_path_segment_factory.hpp in Headers */, 0C08AA351DF83223004195DD /* index_graph_serialization.hpp in Headers */, + 5694CECD1EBA25F7004576D3 /* road_access.hpp in Headers */, 670D049F1B0B4A970013A7AC /* nearest_edge_finder.hpp in Headers */, A120B34F1B4A7C0A002F3808 /* online_absent_fetcher.hpp in Headers */, 0C62BFE61E8ADC3100055A79 /* coding.hpp in Headers */, @@ -1153,6 +1170,7 @@ 56099E2E1CC8FBDA00A7772A /* osrm_path_segment_factory.cpp in Sources */, 349D1CE01E3F589900A878FD /* restrictions_serialization.cpp in Sources */, 56099E351CC9247E00A7772A /* directions_engine.cpp in Sources */, + 5694CECC1EBA25F7004576D3 /* road_access.cpp in Sources */, A1616E2B1B6B60AB003F078E /* router_delegate.cpp in Sources */, 6741AA9C1BF35331002C974C /* turns_notification_manager.cpp in Sources */, 56D637D61E4B12AA00B86D7B /* cross_mwm_index_graph.cpp in Sources */, @@ -1170,6 +1188,7 @@ 674F9BD61B0A580E00704FFA /* turns_generator.cpp in Sources */, A17B42981BCFBD0E00A1EAE4 /* osrm_helpers.cpp in Sources */, 674F9BD21B0A580E00704FFA /* road_graph_router.cpp in Sources */, + 5694CECE1EBA25F7004576D3 /* vehicle_mask.cpp in Sources */, A1876BC61BB19C4300C9C743 /* speed_camera.cpp in Sources */, 0C5FEC691DDE193F0017688C /* road_index.cpp in Sources */, 671F58BD1B874EC80032311E /* followed_polyline.cpp in Sources */, @@ -1178,6 +1197,7 @@ 56099E331CC9247E00A7772A /* bicycle_directions.cpp in Sources */, 674A28B11B1605D2001A525C /* osrm_engine.cpp in Sources */, 0C08AA341DF83223004195DD /* index_graph_serialization.cpp in Sources */, + 5694CECA1EBA25F7004576D3 /* road_access_serialization.cpp in Sources */, 674F9BD41B0A580E00704FFA /* road_graph.cpp in Sources */, 56CA09E51E30E73B00D05C9A /* index_graph_tools.cpp in Sources */, 0C0DF92A1DE898FF0055A22F /* routing_helpers.cpp in Sources */,